From dd05ee3a656cb5eb5d0ab7620dbc7a1cfa4102ab Mon Sep 17 00:00:00 2001
From: Max Leiter <maxwell.leiter@gmail.com>
Date: Sat, 18 Jun 2022 16:25:21 -0800
Subject: [PATCH] TypeScript and Vue 3 (#4559)

Co-authored-by: Eric Nemchik <eric@nemchik.com>
Co-authored-by: Pavel Djundik <xPaw@users.noreply.github.com>
---
 .eslintignore                                 |    1 +
 .eslintrc.cjs                                 |  140 +-
 .gitignore                                    |    1 +
 .npmignore                                    |    7 +-
 .prettierignore                               |    3 +-
 .vscode/extensions.json                       |    3 +-
 .vscode/settings.json                         |    6 +-
 README.md                                     |    7 +-
 babel.config.cjs                              |    3 +-
 client/components/App.vue                     |  199 +-
 client/components/Channel.vue                 |   37 +-
 client/components/ChannelWrapper.vue          |   92 +-
 client/components/Chat.vue                    |  184 +-
 client/components/ChatInput.vue               |  373 ++-
 client/components/ChatUserList.vue            |  162 +-
 client/components/ConfirmDialog.vue           |   78 +-
 client/components/ContextMenu.vue             |  347 ++-
 client/components/DateMarker.vue              |   67 +-
 client/components/Draggable.vue               |  120 +
 client/components/ImageViewer.vue             |  428 +--
 client/components/InlineChannel.vue           |   19 +-
 client/components/JoinChannel.vue             |   61 +-
 client/components/LinkPreview.vue             |  244 +-
 client/components/LinkPreviewFileSize.vue     |   19 +-
 client/components/LinkPreviewToggle.vue       |   36 +-
 client/components/Mentions.vue                |  138 +-
 client/components/Message.vue                 |   83 +-
 client/components/MessageCondensed.vue        |   82 +-
 client/components/MessageList.vue             |  462 +--
 client/components/MessageSearchForm.vue       |  113 +-
 client/components/MessageTypes/away.vue       |   18 +-
 client/components/MessageTypes/back.vue       |   18 +-
 client/components/MessageTypes/chghost.vue    |   18 +-
 client/components/MessageTypes/ctcp.vue       |   22 +-
 .../components/MessageTypes/ctcp_request.vue  |   18 +-
 client/components/MessageTypes/error.vue      |   56 +-
 .../MessageTypes/{index.js => index.ts}       |    4 +-
 client/components/MessageTypes/invite.vue     |   18 +-
 client/components/MessageTypes/join.vue       |   24 +-
 client/components/MessageTypes/kick.vue       |   18 +-
 client/components/MessageTypes/mode.vue       |   18 +-
 .../components/MessageTypes/mode_channel.vue  |   19 +-
 client/components/MessageTypes/mode_user.vue  |   19 +-
 .../MessageTypes/monospace_block.vue          |   32 +-
 client/components/MessageTypes/nick.vue       |   18 +-
 client/components/MessageTypes/part.vue       |   18 +-
 client/components/MessageTypes/quit.vue       |   18 +-
 client/components/MessageTypes/raw.vue        |   19 +-
 client/components/MessageTypes/topic.vue      |   18 +-
 .../components/MessageTypes/topic_set_by.vue  |   28 +-
 client/components/MessageTypes/whois.vue      |   32 +-
 client/components/NetworkForm.vue             |  187 +-
 client/components/NetworkList.vue             |  497 +--
 client/components/NetworkLobby.vue            |   59 +-
 client/components/ParsedMessage.vue           |   23 +-
 client/components/RevealPassword.vue          |   26 +-
 client/components/RoutedChat.vue              |   70 +-
 client/components/Session.vue                 |   35 +-
 client/components/Settings/Account.vue        |  102 +-
 client/components/Settings/Appearance.vue     |   46 +-
 client/components/Settings/General.vue        |  122 +-
 client/components/Settings/Navigation.vue     |    7 +-
 client/components/Settings/Notifications.vue  |   78 +-
 client/components/Settings/SettingTabItem.vue |   35 +-
 client/components/Sidebar.vue                 |  248 +-
 client/components/SidebarToggle.vue           |   18 +-
 client/components/Special/ListBans.vue        |   26 +-
 client/components/Special/ListChannels.vue    |   12 +-
 client/components/Special/ListIgnored.vue     |   20 +-
 client/components/Special/ListInvites.vue     |   20 +-
 client/components/Username.vue                |   79 +-
 client/components/VersionChecker.vue          |   56 +-
 client/components/Windows/Changelog.vue       |   62 +-
 client/components/Windows/Connect.vue         |   68 +-
 client/components/Windows/Help.vue            |   39 +-
 client/components/Windows/NetworkEdit.vue     |   73 +-
 client/components/Windows/SearchResults.vue   |  352 ++-
 client/components/Windows/Settings.vue        |   36 +-
 client/components/Windows/SignIn.vue          |   72 +-
 client/css/style.css                          |    5 +
 client/index.html.tpl                         |    2 +-
 client/js/{auth.js => auth.ts}                |    2 -
 .../{autocompletion.js => autocompletion.ts}  |  106 +-
 client/js/{clipboard.js => clipboard.ts}      |    9 +-
 .../js/commands/{collapse.js => collapse.ts}  |   12 +-
 client/js/commands/{expand.js => expand.ts}   |   12 +-
 client/js/commands/{index.js => index.ts}     |    6 +-
 client/js/commands/{join.js => join.ts}       |   20 +-
 client/js/commands/search.js                  |   24 -
 client/js/commands/search.ts                  |   27 +
 client/js/{constants.js => constants.ts}      |    7 +-
 client/js/{eventbus.js => eventbus.ts}        |   10 +-
 ...{collapseNetwork.js => collapseNetwork.ts} |    2 -
 .../helpers/{colorClass.js => colorClass.ts}  |    6 +-
 .../{contextMenu.js => contextMenu.ts}        |   91 +-
 client/js/helpers/distance.js                 |    5 -
 client/js/helpers/distance.ts                 |    5 +
 .../{friendlysize.js => friendlysize.ts}      |    4 +-
 ...{anyIntersection.js => anyIntersection.ts} |    7 +-
 ...{cleanIrcMessage.js => cleanIrcMessage.ts} |    4 +-
 .../ircmessageparser/{fill.js => fill.ts}     |    9 +-
 .../{findChannels.js => findChannels.ts}      |   13 +-
 .../js/helpers/ircmessageparser/findEmoji.js  |   20 -
 .../js/helpers/ircmessageparser/findEmoji.ts  |   25 +
 .../{findLinks.js => findLinks.ts}            |   31 +-
 .../{findNames.js => findNames.ts}            |   16 +-
 .../ircmessageparser/{merge.js => merge.ts}   |   53 +-
 .../{parseStyle.js => parseStyle.ts}          |   25 +-
 ...nnelCollapsed.js => isChannelCollapsed.ts} |    4 +-
 client/js/helpers/isIgnoredKeybind.js         |   12 -
 client/js/helpers/isIgnoredKeybind.ts         |   13 +
 ...rSwipes.js => listenForTwoFingerSwipes.ts} |   11 +-
 client/js/helpers/localetime.js               |    5 -
 client/js/helpers/localetime.ts               |    3 +
 client/js/helpers/{parse.js => parse.ts}      |  122 +-
 .../{parseIrcUri.js => parseIrcUri.ts}        |    4 +-
 ...oundBadgeNumber.js => roundBadgeNumber.ts} |    4 +-
 client/js/hooks/use-close-channel.ts          |   38 +
 client/js/{keybinds.js => keybinds.ts}        |   33 +-
 client/js/loading-error-handlers.js           |   49 +-
 .../js/{localStorage.js => localStorage.ts}   |    8 +-
 client/js/{location.js => location.ts}        |    2 -
 client/js/{router.js => router.ts}            |   54 +-
 client/js/settings.js                         |  135 -
 client/js/settings.ts                         |  176 ++
 client/js/socket-events/{auth.js => auth.ts}  |   30 +-
 .../{changelog.js => changelog.ts}            |    8 +-
 .../{commands.js => commands.ts}              |    2 +-
 .../{configuration.js => configuration.ts}    |   15 +-
 .../{connection.js => connection.ts}          |    5 +-
 client/js/socket-events/history_clear.js      |   14 -
 client/js/socket-events/history_clear.ts      |   14 +
 .../js/socket-events/{index.js => index.ts}   |    2 -
 client/js/socket-events/{init.js => init.ts}  |   74 +-
 client/js/socket-events/{join.js => join.ts}  |   13 +-
 client/js/socket-events/mentions.js           |    8 -
 client/js/socket-events/mentions.ts           |    7 +
 client/js/socket-events/{more.js => more.ts}  |   18 +-
 client/js/socket-events/{msg.js => msg.ts}    |   44 +-
 client/js/socket-events/msg_preview.js        |   21 -
 client/js/socket-events/msg_preview.ts        |   17 +
 client/js/socket-events/msg_special.js        |   11 -
 client/js/socket-events/msg_special.ts        |   14 +
 client/js/socket-events/mute_changed.js       |   17 -
 client/js/socket-events/mute_changed.ts       |   18 +
 client/js/socket-events/names.js              |   12 -
 client/js/socket-events/names.ts              |   10 +
 .../socket-events/{network.js => network.ts}  |   15 +-
 client/js/socket-events/{nick.js => nick.ts}  |    4 +-
 client/js/socket-events/{open.js => open.ts}  |    4 +-
 client/js/socket-events/{part.js => part.ts}  |    8 +-
 client/js/socket-events/{quit.js => quit.ts}  |    8 +-
 .../js/socket-events/{search.js => search.ts} |    2 +-
 .../{sessions_list.js => sessions_list.ts}    |    4 +-
 client/js/socket-events/setting.js            |   24 -
 client/js/socket-events/setting.ts            |   22 +
 .../{sign_out.js => sign_out.ts}              |    2 -
 .../{sync_sort.js => sync_sort.ts}            |   13 +-
 .../js/socket-events/{topic.js => topic.ts}   |    4 +-
 .../js/socket-events/{users.js => users.ts}   |    4 +-
 client/js/socket.js                           |   17 -
 client/js/socket.ts                           |   22 +
 .../{store-settings.js => store-settings.ts}  |   13 +-
 client/js/store.js                            |  233 --
 client/js/store.ts                            |  414 +++
 client/js/types.d.ts                          |  100 +
 client/js/{upload.js => upload.ts}            |  109 +-
 client/js/vue.js                              |  118 -
 client/js/vue.ts                              |   84 +
 client/js/{webpush.js => webpush.ts}          |    8 +-
 client/service-worker.js                      |    1 +
 client/shims-vue.d.ts                         |    7 +
 client/tsconfig.json                          |   28 +
 index.js                                      |   15 +-
 package.json                                  |   71 +-
 scripts/changelog.js                          |    2 +-
 scripts/generate-config-doc.js                |    2 +-
 server/client.ts                              |  864 ++++++
 server/clientManager.ts                       |  296 ++
 .../index.js => server/command-line/index.ts  |   41 +-
 .../command-line/install.ts                   |   49 +-
 .../command-line/outdated.ts                  |   14 +-
 .../start.js => server/command-line/start.ts  |   26 +-
 server/command-line/uninstall.ts              |   42 +
 .../command-line/upgrade.ts                   |   29 +-
 .../command-line/users/add.ts                 |   22 +-
 .../command-line/users/edit.ts                |   22 +-
 server/command-line/users/index.ts            |   15 +
 .../command-line/users/list.ts                |   18 +-
 .../command-line/users/remove.ts              |   22 +-
 .../command-line/users/reset.ts               |   22 +-
 .../utils.js => server/command-line/utils.ts  |  101 +-
 src/config.js => server/config.ts             |  162 +-
 src/helper.js => server/helper.ts             |   49 +-
 .../identification.ts                         |   69 +-
 server/index.d.ts                             |    1 +
 server/index.ts                               |    8 +
 src/log.js => server/log.ts                   |   25 +-
 server/models/chan.ts                         |  336 +++
 server/models/msg.ts                          |  134 +
 server/models/network.ts                      |  653 ++++
 .../prefix.js => server/models/prefix.ts      |   19 +-
 server/models/user.ts                         |   44 +
 server/plugins/auth.ts                        |   67 +
 .../ldap.js => server/plugins/auth/ldap.ts    |   76 +-
 .../local.js => server/plugins/auth/local.ts  |   16 +-
 .../plugins/changelog.ts                      |   85 +-
 .../plugins/clientCertificate.ts              |   42 +-
 server/plugins/dev-server.ts                  |   42 +
 .../plugins/inputs/action.ts                  |   20 +-
 .../away.js => server/plugins/inputs/away.ts  |   12 +-
 .../ban.js => server/plugins/inputs/ban.ts    |   22 +-
 .../plugins/inputs/connect.ts                 |   19 +-
 server/plugins/inputs/ctcp.ts                 |   37 +
 server/plugins/inputs/disconnect.ts           |   19 +
 .../plugins/inputs/ignore.ts                  |   63 +-
 server/plugins/inputs/index.ts                |  102 +
 .../plugins/inputs/invite.ts                  |   20 +-
 server/plugins/inputs/kick.ts                 |   30 +
 server/plugins/inputs/kill.ts                 |   16 +
 server/plugins/inputs/list.ts                 |   14 +
 .../mode.js => server/plugins/inputs/mode.ts  |   25 +-
 .../msg.js => server/plugins/inputs/msg.ts    |   34 +-
 .../mute.js => server/plugins/inputs/mute.ts  |   28 +-
 .../nick.js => server/plugins/inputs/nick.ts  |   22 +-
 .../plugins/inputs/notice.ts                  |   11 +-
 .../part.js => server/plugins/inputs/part.ts  |   28 +-
 server/plugins/inputs/quit.ts                 |   31 +
 server/plugins/inputs/raw.ts                  |   16 +
 server/plugins/inputs/rejoin.ts               |   29 +
 server/plugins/inputs/topic.ts                |   28 +
 .../plugins/inputs/whois.ts                   |   11 +-
 .../plugins/irc-events/away.ts                |   19 +-
 .../plugins/irc-events/cap.ts                 |   10 +-
 .../plugins/irc-events/chghost.ts             |    8 +-
 .../plugins/irc-events/connection.ts          |   40 +-
 .../plugins/irc-events/ctcp.ts                |   22 +-
 .../plugins/irc-events/error.ts               |   16 +-
 .../plugins/irc-events/help.ts                |    9 +-
 .../plugins/irc-events/info.ts                |    9 +-
 .../plugins/irc-events/invite.ts              |    8 +-
 .../plugins/irc-events/join.ts                |   17 +-
 .../plugins/irc-events/kick.ts                |   19 +-
 .../plugins/irc-events/link.ts                |  125 +-
 .../plugins/irc-events/list.ts                |   20 +-
 .../plugins/irc-events/message.ts             |   74 +-
 .../plugins/irc-events/mode.ts                |   19 +-
 .../plugins/irc-events/modelist.ts            |   29 +-
 .../plugins/irc-events/motd.ts                |   10 +-
 .../plugins/irc-events/names.ts               |    4 +-
 .../plugins/irc-events/nick.ts                |    9 +-
 .../plugins/irc-events/part.ts                |   12 +-
 .../plugins/irc-events/quit.ts                |    8 +-
 .../plugins/irc-events/sasl.ts                |   11 +-
 .../plugins/irc-events/topic.ts               |   10 +-
 .../plugins/irc-events/unhandled.ts           |    8 +-
 .../plugins/irc-events/welcome.ts             |    6 +-
 .../plugins/irc-events/whois.ts               |   15 +-
 .../plugins/messageStorage/sqlite.ts          |   73 +-
 .../plugins/messageStorage/text.ts            |   65 +-
 server/plugins/messageStorage/types.d.ts      |   45 +
 .../plugins/packages/index.ts                 |  118 +-
 .../plugins/packages/publicClient.ts          |   28 +-
 .../plugins/packages/themes.ts                |   50 +-
 .../storage.js => server/plugins/storage.ts   |   27 +-
 src/plugins/sts.js => server/plugins/sts.ts   |   39 +-
 .../uploader.js => server/plugins/uploader.ts |  131 +-
 .../webpush.js => server/plugins/webpush.ts   |   43 +-
 src/server.js => server/server.ts             |  348 ++-
 server/tsconfig.json                          |   27 +
 server/types/index.d.ts                       |    2 +
 server/types/modules/irc-framework.d.ts       |  430 +++
 server/types/socket-events.d.ts               |  224 ++
 src/client.js                                 |  771 -----
 src/clientManager.js                          |  284 --
 src/command-line/uninstall.js                 |   38 -
 src/command-line/users/index.js               |   10 -
 src/models/chan.js                            |  304 --
 src/models/msg.js                             |   92 -
 src/models/network.js                         |  558 ----
 src/models/user.js                            |   35 -
 src/plugins/auth.js                           |   50 -
 src/plugins/dev-server.js                     |   28 -
 src/plugins/inputs/ctcp.js                    |   29 -
 src/plugins/inputs/disconnect.js              |   13 -
 src/plugins/inputs/index.js                   |   65 -
 src/plugins/inputs/kick.js                    |   26 -
 src/plugins/inputs/kill.js                    |   11 -
 src/plugins/inputs/list.js                    |    9 -
 src/plugins/inputs/quit.js                    |   25 -
 src/plugins/inputs/raw.js                     |   11 -
 src/plugins/inputs/rejoin.js                  |   24 -
 src/plugins/inputs/topic.js                   |   23 -
 test/.mocharc.yml                             |   11 +-
 test/.nycrc-mocha.json                        |    5 +-
 .../components/ParsedMessageTestWrapper.vue   |   12 +-
 test/client/{index.js => index.ts}            |    3 +-
 test/client/js/authTest.js                    |   31 -
 test/client/js/authTest.ts                    |   34 +
 .../js/{constantsTest.js => constantsTest.ts} |    8 +-
 ...riendlysizeTest.js => friendlysizeTest.ts} |    6 +-
 ...{anyIntersection.js => anyIntersection.ts} |    7 +-
 ...{cleanIrcMessage.js => cleanIrcMessage.ts} |    6 +-
 .../ircmessageparser/{fill.js => fill.ts}     |    6 +-
 .../{findChannels.js => findChannels.ts}      |    7 +-
 .../{findEmoji.js => findEmoji.ts}            |    6 +-
 .../{findLinks.js => findLinks.ts}            |    8 +-
 .../{findNames.js => findNames.ts}            |    6 +-
 .../ircmessageparser/{merge.js => merge.ts}   |    8 +-
 .../{parseStyle.js => parseStyle.ts}          |    6 +-
 .../{localetimeTest.js => localetimeTest.ts}  |    6 +-
 test/client/js/helpers/{parse.js => parse.ts} |  118 +-
 .../{parseIrcUri.js => parseIrcUri.ts}        |    6 +-
 ...eNumberTest.js => roundBadgeNumberTest.ts} |    6 +-
 test/commands/{mode.js => mode.ts}            |   32 +-
 test/fixtures/.gitignore                      |    1 +
 test/fixtures/.thelounge/config.js            |    3 +-
 test/fixtures/env.js                          |   13 -
 test/fixtures/env.ts                          |    5 +
 test/models/{chan.js => chan.ts}              |   20 +-
 test/models/{msg.js => msg.ts}                |   17 +-
 test/models/{network.js => network.ts}        |  101 +-
 test/plugins/auth/{ldap.js => ldap.ts}        |   62 +-
 ...entCertificate.js => clientCertificate.ts} |   16 +-
 .../inputs/{indexTest.js => indexTest.ts}     |    6 +-
 test/plugins/{link.js => link.ts}             |   24 +-
 .../packages/{indexTest.js => indexTest.ts}   |   33 +-
 test/plugins/{sqlite.js => sqlite.ts}         |   79 +-
 test/plugins/{storage.js => storage.ts}       |   22 +-
 test/{server.js => server.ts}                 |   50 +-
 .../{utilsTest.js => utilsTest.ts}            |   49 +-
 test/src/{helperTest.js => helperTest.ts}     |   10 +-
 test/tests/{build.js => build.ts}             |    8 +-
 ...ustomhighlights.js => customhighlights.ts} |   30 +-
 test/tests/{hexip.js => hexip.ts}             |    6 +-
 test/tests/{hostmask.js => hostmask.ts}       |    6 +-
 test/tests/{mergeConfig.js => mergeConfig.ts} |   77 +-
 test/tests/nickhighlights.js                  |   63 -
 test/tests/nickhighlights.ts                  |   61 +
 test/tests/{passwords.js => passwords.ts}     |    6 +-
 .../{textLogFolder.js => textLogFolder.ts}    |   15 +-
 test/tsconfig.json                            |   23 +
 test/util.js                                  |   67 -
 test/util.ts                                  |   71 +
 tsconfig.base.json                            |  104 +
 tsconfig.json                                 |   20 +
 volar.config.js                               |   14 +
 webpack.config.js => webpack.config.ts        |   90 +-
 yarn.lock                                     | 2655 ++++++++++-------
 349 files changed, 13395 insertions(+), 8810 deletions(-)
 create mode 100644 client/components/Draggable.vue
 rename client/components/MessageTypes/{index.js => index.ts} (83%)
 rename client/js/{auth.js => auth.ts} (91%)
 rename client/js/{autocompletion.js => autocompletion.ts} (69%)
 rename client/js/{clipboard.js => clipboard.ts} (78%)
 rename client/js/commands/{collapse.js => collapse.ts} (78%)
 rename client/js/commands/{expand.js => expand.ts} (78%)
 rename client/js/commands/{index.js => index.ts} (76%)
 rename client/js/commands/{join.js => join.ts} (67%)
 delete mode 100644 client/js/commands/search.js
 create mode 100644 client/js/commands/search.ts
 rename client/js/{constants.js => constants.ts} (87%)
 rename client/js/{eventbus.js => eventbus.ts} (77%)
 rename client/js/helpers/{collapseNetwork.js => collapseNetwork.ts} (96%)
 rename client/js/helpers/{colorClass.js => colorClass.ts} (78%)
 rename client/js/helpers/{contextMenu.js => contextMenu.ts} (80%)
 delete mode 100644 client/js/helpers/distance.js
 create mode 100644 client/js/helpers/distance.ts
 rename client/js/helpers/{friendlysize.js => friendlysize.ts} (88%)
 rename client/js/helpers/ircmessageparser/{anyIntersection.js => anyIntersection.ts} (82%)
 rename client/js/helpers/ircmessageparser/{cleanIrcMessage.js => cleanIrcMessage.ts} (60%)
 rename client/js/helpers/ircmessageparser/{fill.js => fill.ts} (83%)
 rename client/js/helpers/ircmessageparser/{findChannels.js => findChannels.ts} (85%)
 delete mode 100644 client/js/helpers/ircmessageparser/findEmoji.js
 create mode 100644 client/js/helpers/ircmessageparser/findEmoji.ts
 rename client/js/helpers/ircmessageparser/{findLinks.js => findLinks.ts} (59%)
 rename client/js/helpers/ircmessageparser/{findNames.js => findNames.ts} (54%)
 rename client/js/helpers/ircmessageparser/{merge.js => merge.ts} (54%)
 rename client/js/helpers/ircmessageparser/{parseStyle.js => parseStyle.ts} (93%)
 rename client/js/helpers/{isChannelCollapsed.js => isChannelCollapsed.ts} (85%)
 delete mode 100644 client/js/helpers/isIgnoredKeybind.js
 create mode 100644 client/js/helpers/isIgnoredKeybind.ts
 rename client/js/helpers/{listenForTwoFingerSwipes.js => listenForTwoFingerSwipes.ts} (95%)
 delete mode 100644 client/js/helpers/localetime.js
 create mode 100644 client/js/helpers/localetime.ts
 rename client/js/helpers/{parse.js => parse.ts} (65%)
 rename client/js/helpers/{parseIrcUri.js => parseIrcUri.ts} (95%)
 rename client/js/helpers/{roundBadgeNumber.js => roundBadgeNumber.ts} (71%)
 create mode 100644 client/js/hooks/use-close-channel.ts
 rename client/js/{keybinds.js => keybinds.ts} (87%)
 rename client/js/{localStorage.js => localStorage.ts} (92%)
 rename client/js/{location.js => location.ts} (93%)
 rename client/js/{router.js => router.ts} (78%)
 delete mode 100644 client/js/settings.js
 create mode 100644 client/js/settings.ts
 rename client/js/socket-events/{auth.js => auth.ts} (82%)
 rename client/js/socket-events/{changelog.js => changelog.ts} (91%)
 rename client/js/socket-events/{commands.js => commands.ts} (75%)
 rename client/js/socket-events/{configuration.js => configuration.ts} (73%)
 rename client/js/socket-events/{connection.js => connection.ts} (90%)
 delete mode 100644 client/js/socket-events/history_clear.js
 create mode 100644 client/js/socket-events/history_clear.ts
 rename client/js/socket-events/{index.js => index.ts} (97%)
 rename client/js/socket-events/{init.js => init.ts} (70%)
 rename client/js/socket-events/{join.js => join.ts} (64%)
 delete mode 100644 client/js/socket-events/mentions.js
 create mode 100644 client/js/socket-events/mentions.ts
 rename client/js/socket-events/{more.js => more.ts} (57%)
 rename client/js/socket-events/{msg.js => msg.ts} (84%)
 delete mode 100644 client/js/socket-events/msg_preview.js
 create mode 100644 client/js/socket-events/msg_preview.ts
 delete mode 100644 client/js/socket-events/msg_special.js
 create mode 100644 client/js/socket-events/msg_special.ts
 delete mode 100644 client/js/socket-events/mute_changed.js
 create mode 100644 client/js/socket-events/mute_changed.ts
 delete mode 100644 client/js/socket-events/names.js
 create mode 100644 client/js/socket-events/names.ts
 rename client/js/socket-events/{network.js => network.ts} (86%)
 rename client/js/socket-events/{nick.js => nick.ts} (79%)
 rename client/js/socket-events/{open.js => open.ts} (93%)
 rename client/js/socket-events/{part.js => part.ts} (80%)
 rename client/js/socket-events/{quit.js => quit.ts} (83%)
 rename client/js/socket-events/{search.js => search.ts} (90%)
 rename client/js/socket-events/{sessions_list.js => sessions_list.ts} (78%)
 delete mode 100644 client/js/socket-events/setting.js
 create mode 100644 client/js/socket-events/setting.ts
 rename client/js/socket-events/{sign_out.js => sign_out.ts} (88%)
 rename client/js/socket-events/{sync_sort.js => sync_sort.ts} (51%)
 rename client/js/socket-events/{topic.js => topic.ts} (80%)
 rename client/js/socket-events/{users.js => users.ts} (88%)
 delete mode 100644 client/js/socket.js
 create mode 100644 client/js/socket.ts
 rename client/js/{store-settings.js => store-settings.ts} (88%)
 delete mode 100644 client/js/store.js
 create mode 100644 client/js/store.ts
 create mode 100644 client/js/types.d.ts
 rename client/js/{upload.js => upload.ts} (73%)
 delete mode 100644 client/js/vue.js
 create mode 100644 client/js/vue.ts
 rename client/js/{webpush.js => webpush.ts} (92%)
 create mode 100644 client/shims-vue.d.ts
 create mode 100644 client/tsconfig.json
 create mode 100644 server/client.ts
 create mode 100644 server/clientManager.ts
 rename src/command-line/index.js => server/command-line/index.ts (79%)
 rename src/command-line/install.js => server/command-line/install.ts (69%)
 rename src/command-line/outdated.js => server/command-line/outdated.ts (68%)
 rename src/command-line/start.js => server/command-line/start.ts (61%)
 create mode 100644 server/command-line/uninstall.ts
 rename src/command-line/upgrade.js => server/command-line/upgrade.ts (71%)
 rename src/command-line/users/add.js => server/command-line/users/add.ts (81%)
 rename src/command-line/users/edit.js => server/command-line/users/edit.ts (71%)
 create mode 100644 server/command-line/users/index.ts
 rename src/command-line/users/list.js => server/command-line/users/list.ts (63%)
 rename src/command-line/users/remove.js => server/command-line/users/remove.ts (59%)
 rename src/command-line/users/reset.js => server/command-line/users/reset.ts (79%)
 rename src/command-line/utils.js => server/command-line/utils.ts (61%)
 rename src/config.js => server/config.ts (54%)
 rename src/helper.js => server/helper.ts (79%)
 rename src/identification.js => server/identification.ts (59%)
 create mode 100644 server/index.d.ts
 create mode 100755 server/index.ts
 rename src/log.js => server/log.ts (62%)
 create mode 100644 server/models/chan.ts
 create mode 100644 server/models/msg.ts
 create mode 100644 server/models/network.ts
 rename src/models/prefix.js => server/models/prefix.ts (58%)
 create mode 100644 server/models/user.ts
 create mode 100644 server/plugins/auth.ts
 rename src/plugins/auth/ldap.js => server/plugins/auth/ldap.ts (70%)
 rename src/plugins/auth/local.js => server/plugins/auth/local.ts (77%)
 rename src/plugins/changelog.js => server/plugins/changelog.ts (54%)
 rename src/plugins/clientCertificate.js => server/plugins/clientCertificate.ts (77%)
 create mode 100644 server/plugins/dev-server.ts
 rename src/plugins/inputs/action.js => server/plugins/inputs/action.ts (60%)
 rename src/plugins/inputs/away.js => server/plugins/inputs/away.ts (53%)
 rename src/plugins/inputs/ban.js => server/plugins/inputs/ban.ts (60%)
 rename src/plugins/inputs/connect.js => server/plugins/inputs/connect.ts (61%)
 create mode 100644 server/plugins/inputs/ctcp.ts
 create mode 100644 server/plugins/inputs/disconnect.ts
 rename src/plugins/inputs/ignore.js => server/plugins/inputs/ignore.ts (60%)
 create mode 100644 server/plugins/inputs/index.ts
 rename src/plugins/inputs/invite.js => server/plugins/inputs/invite.ts (50%)
 create mode 100644 server/plugins/inputs/kick.ts
 create mode 100644 server/plugins/inputs/kill.ts
 create mode 100644 server/plugins/inputs/list.ts
 rename src/plugins/inputs/mode.js => server/plugins/inputs/mode.ts (60%)
 rename src/plugins/inputs/msg.js => server/plugins/inputs/msg.ts (77%)
 rename src/plugins/inputs/mute.js => server/plugins/inputs/mute.ts (61%)
 rename src/plugins/inputs/nick.js => server/plugins/inputs/nick.ts (72%)
 rename src/plugins/inputs/notice.js => server/plugins/inputs/notice.ts (79%)
 rename src/plugins/inputs/part.js => server/plugins/inputs/part.ts (60%)
 create mode 100644 server/plugins/inputs/quit.ts
 create mode 100644 server/plugins/inputs/raw.ts
 create mode 100644 server/plugins/inputs/rejoin.ts
 create mode 100644 server/plugins/inputs/topic.ts
 rename src/plugins/inputs/whois.js => server/plugins/inputs/whois.ts (64%)
 rename src/plugins/irc-events/away.js => server/plugins/irc-events/away.ts (69%)
 rename src/plugins/irc-events/cap.js => server/plugins/irc-events/cap.ts (88%)
 rename src/plugins/irc-events/chghost.js => server/plugins/irc-events/chghost.ts (77%)
 rename src/plugins/irc-events/connection.js => server/plugins/irc-events/connection.ts (82%)
 rename src/plugins/irc-events/ctcp.js => server/plugins/irc-events/ctcp.ts (79%)
 rename src/plugins/irc-events/error.js => server/plugins/irc-events/error.ts (86%)
 rename src/plugins/irc-events/help.js => server/plugins/irc-events/help.ts (55%)
 rename src/plugins/irc-events/info.js => server/plugins/irc-events/info.ts (55%)
 rename src/plugins/irc-events/invite.js => server/plugins/irc-events/invite.ts (72%)
 rename src/plugins/irc-events/join.js => server/plugins/irc-events/join.ts (74%)
 rename src/plugins/irc-events/kick.js => server/plugins/irc-events/kick.ts (54%)
 rename src/plugins/irc-events/link.js => server/plugins/irc-events/link.ts (79%)
 rename src/plugins/irc-events/list.js => server/plugins/irc-events/list.ts (69%)
 rename src/plugins/irc-events/message.js => server/plugins/irc-events/message.ts (73%)
 rename src/plugins/irc-events/mode.js => server/plugins/irc-events/mode.ts (87%)
 rename src/plugins/irc-events/modelist.js => server/plugins/irc-events/modelist.ts (66%)
 rename src/plugins/irc-events/motd.js => server/plugins/irc-events/motd.ts (61%)
 rename src/plugins/irc-events/names.js => server/plugins/irc-events/names.ts (82%)
 rename src/plugins/irc-events/nick.js => server/plugins/irc-events/nick.ts (76%)
 rename src/plugins/irc-events/part.js => server/plugins/irc-events/part.ts (70%)
 rename src/plugins/irc-events/quit.js => server/plugins/irc-events/quit.ts (76%)
 rename src/plugins/irc-events/sasl.js => server/plugins/irc-events/sasl.ts (57%)
 rename src/plugins/irc-events/topic.js => server/plugins/irc-events/topic.ts (78%)
 rename src/plugins/irc-events/unhandled.js => server/plugins/irc-events/unhandled.ts (79%)
 rename src/plugins/irc-events/welcome.js => server/plugins/irc-events/welcome.ts (71%)
 rename src/plugins/irc-events/whois.js => server/plugins/irc-events/whois.ts (75%)
 rename src/plugins/messageStorage/sqlite.js => server/plugins/messageStorage/sqlite.ts (78%)
 rename src/plugins/messageStorage/text.js => server/plugins/messageStorage/text.ts (73%)
 create mode 100644 server/plugins/messageStorage/types.d.ts
 rename src/plugins/packages/index.js => server/plugins/packages/index.ts (62%)
 rename src/plugins/packages/publicClient.js => server/plugins/packages/publicClient.ts (68%)
 rename src/plugins/packages/themes.js => server/plugins/packages/themes.ts (55%)
 rename src/plugins/storage.js => server/plugins/storage.ts (80%)
 rename src/plugins/sts.js => server/plugins/sts.ts (67%)
 rename src/plugins/uploader.js => server/plugins/uploader.ts (70%)
 rename src/plugins/webpush.js => server/plugins/webpush.ts (69%)
 rename src/server.js => server/server.ts (71%)
 create mode 100644 server/tsconfig.json
 create mode 100644 server/types/index.d.ts
 create mode 100644 server/types/modules/irc-framework.d.ts
 create mode 100644 server/types/socket-events.d.ts
 delete mode 100644 src/client.js
 delete mode 100644 src/clientManager.js
 delete mode 100644 src/command-line/uninstall.js
 delete mode 100644 src/command-line/users/index.js
 delete mode 100644 src/models/chan.js
 delete mode 100644 src/models/msg.js
 delete mode 100644 src/models/network.js
 delete mode 100644 src/models/user.js
 delete mode 100644 src/plugins/auth.js
 delete mode 100644 src/plugins/dev-server.js
 delete mode 100644 src/plugins/inputs/ctcp.js
 delete mode 100644 src/plugins/inputs/disconnect.js
 delete mode 100644 src/plugins/inputs/index.js
 delete mode 100644 src/plugins/inputs/kick.js
 delete mode 100644 src/plugins/inputs/kill.js
 delete mode 100644 src/plugins/inputs/list.js
 delete mode 100644 src/plugins/inputs/quit.js
 delete mode 100644 src/plugins/inputs/raw.js
 delete mode 100644 src/plugins/inputs/rejoin.js
 delete mode 100644 src/plugins/inputs/topic.js
 rename test/client/{index.js => index.ts} (55%)
 delete mode 100644 test/client/js/authTest.js
 create mode 100644 test/client/js/authTest.ts
 rename test/client/js/{constantsTest.js => constantsTest.ts} (83%)
 rename test/client/js/helpers/{friendlysizeTest.js => friendlysizeTest.ts} (86%)
 rename test/client/js/helpers/ircmessageparser/{anyIntersection.js => anyIntersection.ts} (80%)
 rename test/client/js/helpers/ircmessageparser/{cleanIrcMessage.js => cleanIrcMessage.ts} (91%)
 rename test/client/js/helpers/ircmessageparser/{fill.js => fill.ts} (86%)
 rename test/client/js/helpers/ircmessageparser/{findChannels.js => findChannels.ts} (93%)
 rename test/client/js/helpers/ircmessageparser/{findEmoji.js => findEmoji.ts} (88%)
 rename test/client/js/helpers/ircmessageparser/{findLinks.js => findLinks.ts} (98%)
 rename test/client/js/helpers/ircmessageparser/{findNames.js => findNames.ts} (90%)
 rename test/client/js/helpers/ircmessageparser/{merge.js => merge.ts} (94%)
 rename test/client/js/helpers/ircmessageparser/{parseStyle.js => parseStyle.ts} (99%)
 rename test/client/js/helpers/{localetimeTest.js => localetimeTest.ts} (76%)
 rename test/client/js/helpers/{parse.js => parse.ts} (82%)
 rename test/client/js/helpers/{parseIrcUri.js => parseIrcUri.ts} (94%)
 rename test/client/js/helpers/{roundBadgeNumberTest.js => roundBadgeNumberTest.ts} (81%)
 rename test/commands/{mode.js => mode.ts} (86%)
 delete mode 100644 test/fixtures/env.js
 create mode 100644 test/fixtures/env.ts
 rename test/models/{chan.js => chan.ts} (92%)
 rename test/models/{msg.js => msg.ts} (76%)
 rename test/models/{network.js => network.ts} (82%)
 rename test/plugins/auth/{ldap.js => ldap.ts} (72%)
 rename test/plugins/{clientCertificate.js => clientCertificate.ts} (84%)
 rename test/plugins/inputs/{indexTest.js => indexTest.ts} (81%)
 rename test/plugins/{link.js => link.ts} (97%)
 rename test/plugins/packages/{indexTest.js => indexTest.ts} (66%)
 rename test/plugins/{sqlite.js => sqlite.ts} (77%)
 rename test/plugins/{storage.js => storage.ts} (89%)
 rename test/{server.js => server.ts} (71%)
 rename test/src/command-line/{utilsTest.js => utilsTest.ts} (84%)
 rename test/src/{helperTest.js => helperTest.ts} (89%)
 rename test/tests/{build.js => build.ts} (96%)
 rename test/tests/{customhighlights.js => customhighlights.ts} (83%)
 rename test/tests/{hexip.js => hexip.ts} (85%)
 rename test/tests/{hostmask.js => hostmask.ts} (97%)
 rename test/tests/{mergeConfig.js => mergeConfig.ts} (84%)
 delete mode 100644 test/tests/nickhighlights.js
 create mode 100644 test/tests/nickhighlights.ts
 rename test/tests/{passwords.js => passwords.ts} (93%)
 rename test/tests/{textLogFolder.js => textLogFolder.ts} (83%)
 create mode 100644 test/tsconfig.json
 delete mode 100644 test/util.js
 create mode 100644 test/util.ts
 create mode 100644 tsconfig.base.json
 create mode 100644 tsconfig.json
 create mode 100644 volar.config.js
 rename webpack.config.js => webpack.config.ts (61%)

diff --git a/.eslintignore b/.eslintignore
index 1f2ae53f..219bb10b 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1,3 @@
 public/
 coverage/
+dist/
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index ca48b1ad..4b567364 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -1,14 +1,18 @@
-module.exports = {
-	root: true,
+// @ts-check
+const {defineConfig} = require("eslint-define-config");
+
+const projects = defineConfig({
 	parserOptions: {
-		ecmaVersion: 2022,
-	},
-	env: {
-		es6: true,
-		browser: true,
-		mocha: true,
-		node: true,
+		project: [
+			"./tsconfig.json",
+			"./client/tsconfig.json",
+			"./server/tsconfig.json",
+			"./test/tsconfig.json",
+		],
 	},
+}).parserOptions.project;
+
+const baseRules = defineConfig({
 	rules: {
 		"block-scoped-var": "error",
 		curly: ["error", "all"],
@@ -23,7 +27,6 @@ module.exports = {
 		"no-else-return": "error",
 		"no-implicit-globals": "error",
 		"no-restricted-globals": ["error", "event", "fdescribe"],
-		"no-shadow": "error",
 		"no-template-curly-in-string": "error",
 		"no-unsafe-negation": "error",
 		"no-useless-computed-key": "error",
@@ -62,18 +65,127 @@ module.exports = {
 		"spaced-comment": ["error", "always"],
 		strict: "off",
 		yoda: "error",
+	},
+}).rules;
+
+const vueRules = defineConfig({
+	rules: {
+		"import/no-default-export": 0,
+		"import/unambiguous": 0, // vue SFC can miss script tags
+		"@typescript-eslint/prefer-readonly": 0, // can be used in template
 		"vue/component-tags-order": [
 			"error",
 			{
 				order: ["template", "style", "script"],
 			},
 		],
+		"vue/multi-word-component-names": "off",
 		"vue/no-mutating-props": "off",
 		"vue/no-v-html": "off",
 		"vue/require-default-prop": "off",
 		"vue/v-slot-style": ["error", "longform"],
-		"vue/multi-word-component-names": "off",
 	},
-	plugins: ["vue"],
-	extends: ["eslint:recommended", "plugin:vue/recommended", "prettier"],
-};
+}).rules;
+
+const tsRules = defineConfig({
+	rules: {
+		// note you must disable the base rule as it can report incorrect errors
+		"no-shadow": "off",
+		"@typescript-eslint/no-shadow": ["error"],
+	},
+}).rules;
+
+const tsRulesTemp = defineConfig({
+	rules: {
+		// TODO: eventually remove these
+		"@typescript-eslint/ban-ts-comment": "off",
+		"@typescript-eslint/no-explicit-any": "off",
+		"@typescript-eslint/no-non-null-assertion": "off",
+		"@typescript-eslint/no-this-alias": "off",
+		"@typescript-eslint/no-unnecessary-type-assertion": "off",
+		"@typescript-eslint/no-unsafe-argument": "off",
+		"@typescript-eslint/no-unsafe-assignment": "off",
+		"@typescript-eslint/no-unsafe-call": "off",
+		"@typescript-eslint/no-unsafe-member-access": "off",
+		"@typescript-eslint/no-unused-vars": "off",
+	},
+}).rules;
+
+const tsTestRulesTemp = defineConfig({
+	rules: {
+		// TODO: remove these
+		"@typescript-eslint/no-unsafe-return": "off",
+		"@typescript-eslint/no-empty-function": "off",
+		"@typescript-eslint/restrict-plus-operands": "off",
+	},
+}).rules;
+
+module.exports = defineConfig({
+	root: true,
+	parserOptions: {
+		ecmaVersion: 2022,
+	},
+	overrides: [
+		{
+			files: ["**/*.ts", "**/*.vue"],
+			parser: "@typescript-eslint/parser",
+			parserOptions: {
+				tsconfigRootDir: __dirname,
+				project: projects,
+				extraFileExtensions: [".vue"],
+			},
+			plugins: ["@typescript-eslint"],
+			extends: [
+				"eslint:recommended",
+				"plugin:@typescript-eslint/recommended",
+				"plugin:@typescript-eslint/recommended-requiring-type-checking",
+				"prettier",
+			],
+			rules: {
+				...baseRules,
+				...tsRules,
+				...tsRulesTemp,
+			},
+		},
+		{
+			files: ["**/*.vue"],
+			parser: "vue-eslint-parser",
+			parserOptions: {
+				ecmaVersion: 2022,
+				ecmaFeatures: {
+					jsx: true,
+				},
+				parser: "@typescript-eslint/parser",
+				tsconfigRootDir: __dirname,
+				project: projects,
+			},
+			plugins: ["vue"],
+			extends: [
+				"eslint:recommended",
+				"plugin:vue/vue3-recommended",
+				"plugin:@typescript-eslint/recommended",
+				"plugin:@typescript-eslint/recommended-requiring-type-checking",
+				"prettier",
+			],
+			rules: {...baseRules, ...tsRules, ...tsRulesTemp, ...vueRules},
+		},
+		{
+			files: ["./tests/**/*.ts"],
+			parser: "@typescript-eslint/parser",
+			rules: {
+				...baseRules,
+				...tsRules,
+				...tsRulesTemp,
+				...tsTestRulesTemp,
+			},
+		},
+	],
+	env: {
+		es6: true,
+		browser: true,
+		mocha: true,
+		node: true,
+	},
+	extends: ["eslint:recommended", "prettier"],
+	rules: baseRules,
+});
diff --git a/.gitignore b/.gitignore
index 348de645..2f36fb37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ package-lock.json
 
 coverage/
 public/
+dist/
diff --git a/.npmignore b/.npmignore
index e902f20a..8df5322f 100644
--- a/.npmignore
+++ b/.npmignore
@@ -9,9 +9,9 @@
 # Ignore client folder as it's being built into public/ folder
 # except for the specified files which are used by the server
 client/**
-!client/js/constants.js
-!client/js/helpers/ircmessageparser/findLinks.js
-!client/js/helpers/ircmessageparser/cleanIrcMessage.js
+!client/js/constants.ts
+!client/js/helpers/ircmessageparser/findLinks.ts
+!client/js/helpers/ircmessageparser/cleanIrcMessage.ts
 !client/index.html.tpl
 
 public/js/bundle.vendor.js.map
@@ -22,3 +22,4 @@ appveyor.yml
 webpack.config*.js
 postcss.config.js
 renovate.json
+
diff --git a/.prettierignore b/.prettierignore
index aa316e17..5dabdfae 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,9 +1,10 @@
 coverage/
 public/
+dist/
 test/fixtures/.thelounge/logs/
 test/fixtures/.thelounge/certificates/
 test/fixtures/.thelounge/storage/
-
+test/fixtures/.thelounge/sts-policies.json
 *.log
 *.png
 *.svg
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index d401e0e3..6e4bf808 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -3,7 +3,8 @@
     "EditorConfig.EditorConfig",
     "esbenp.prettier-vscode",
     "dbaeumer.vscode-eslint",
-    "octref.vetur"
+    "Vue.volar",
+    "Vue.vscode-typescript-vue-plugin"
   ],
   "unwantedRecommendations": []
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index d80731df..a7e07398 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,10 +1,10 @@
 {
   "editor.formatOnSave": true,
-  "vetur.format.enable": false,
   "prettier.useEditorConfig": true,
   "prettier.requireConfig": true,
   "prettier.disableLanguages": [],
-  "prettier.packageManager": "yarn",
   "eslint.packageManager": "yarn",
-  "eslint.codeActionsOnSave.mode": "all"
+  "eslint.codeActionsOnSave.mode": "all",
+  "[typescript]": {"editor.defaultFormatter": "esbenp.prettier-vscode"},
+  "[vue]": {"editor.defaultFormatter": "esbenp.prettier-vscode"}
 }
diff --git a/README.md b/README.md
index 8fb2fb62..31665ab7 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ The Lounge is the official and community-managed fork of [Shout](https://github.
 ## Installation and usage
 
 The Lounge requires latest [Node.js](https://nodejs.org/) LTS version or more recent.
-[Yarn package manager](https://yarnpkg.com/) is also recommended.  
+The [Yarn package manager](https://yarnpkg.com/) is also recommended.
 If you want to install with npm, `--unsafe-perm` is required for a correct install.
 
 ### Running stable releases
@@ -85,5 +85,8 @@ Before submitting any change, make sure to:
 - Read the [Contributing instructions](https://github.com/thelounge/thelounge/blob/master/.github/CONTRIBUTING.md#contributing)
 - Run `yarn test` to execute linters and the test suite
   - Run `yarn format:prettier` if linting fails
-- Run `yarn build` if you change or add anything in `client/js` or `client/components`
+- Run `yarn build:client` if you change or add anything in `client/js` or `client/components`
+  - The built files will be output to `public/` by webpack
+- Run `yarn build:server` if you change anything in `server/`
+  - The built files will be output to `dist/` by tsc
 - `yarn dev` can be used to start The Lounge with hot module reloading
diff --git a/babel.config.cjs b/babel.config.cjs
index 059d55ab..8554cbc5 100644
--- a/babel.config.cjs
+++ b/babel.config.cjs
@@ -1,3 +1,4 @@
 module.exports = {
-	presets: [["@babel/env"]],
+	presets: [["@babel/preset-env", {bugfixes: true}], "babel-preset-typescript-vue3"],
+	plugins: ["@babel/plugin-transform-runtime"],
 };
diff --git a/client/components/App.vue b/client/components/App.vue
index e02a10e7..61bbb3b7 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -1,13 +1,13 @@
 <template>
 	<div id="viewport" :class="viewportClasses" role="tablist">
-		<Sidebar v-if="$store.state.appLoaded" :overlay="$refs.overlay" />
+		<Sidebar v-if="store.state.appLoaded" :overlay="overlay" />
 		<div
 			id="sidebar-overlay"
 			ref="overlay"
 			aria-hidden="true"
-			@click="$store.commit('sidebarOpen', false)"
+			@click="store.commit('sidebarOpen', false)"
 		/>
-		<router-view ref="window"></router-view>
+		<router-view ref="loungeWindow"></router-view>
 		<Mentions />
 		<ImageViewer ref="imageViewer" />
 		<ContextMenu ref="contextMenu" />
@@ -16,10 +16,10 @@
 	</div>
 </template>
 
-<script>
-const constants = require("../js/constants");
+<script lang="ts">
+import constants from "../js/constants";
 import eventbus from "../js/eventbus";
-import Mousetrap from "mousetrap";
+import Mousetrap, {ExtendedKeyboardEvent} from "mousetrap";
 import throttle from "lodash/throttle";
 import storage from "../js/localStorage";
 import isIgnoredKeybind from "../js/helpers/isIgnoredKeybind";
@@ -29,8 +29,29 @@ import ImageViewer from "./ImageViewer.vue";
 import ContextMenu from "./ContextMenu.vue";
 import ConfirmDialog from "./ConfirmDialog.vue";
 import Mentions from "./Mentions.vue";
+import {
+	computed,
+	provide,
+	defineComponent,
+	onBeforeUnmount,
+	onMounted,
+	ref,
+	Ref,
+	InjectionKey,
+	inject,
+} from "vue";
+import {useStore} from "../js/store";
+import type {DebouncedFunc} from "lodash";
 
-export default {
+export const imageViewerKey = Symbol() as InjectionKey<Ref<typeof ImageViewer | null>>;
+const contextMenuKey = Symbol() as InjectionKey<Ref<typeof ContextMenu | null>>;
+const confirmDialogKey = Symbol() as InjectionKey<Ref<typeof ConfirmDialog | null>>;
+
+export const useImageViewer = () => {
+	return inject(imageViewerKey) as Ref<typeof ImageViewer | null>;
+};
+
+export default defineComponent({
 	name: "App",
 	components: {
 		Sidebar,
@@ -39,93 +60,78 @@ export default {
 		ConfirmDialog,
 		Mentions,
 	},
-	computed: {
-		viewportClasses() {
+	setup() {
+		const store = useStore();
+		const overlay = ref(null);
+		const loungeWindow = ref(null);
+		const imageViewer = ref(null);
+		const contextMenu = ref(null);
+		const confirmDialog = ref(null);
+
+		provide(imageViewerKey, imageViewer);
+		provide(contextMenuKey, contextMenu);
+		provide(confirmDialogKey, confirmDialog);
+
+		const viewportClasses = computed(() => {
 			return {
-				notified: this.$store.getters.highlightCount > 0,
-				"menu-open": this.$store.state.appLoaded && this.$store.state.sidebarOpen,
-				"menu-dragging": this.$store.state.sidebarDragging,
-				"userlist-open": this.$store.state.userlistOpen,
+				notified: store.getters.highlightCount > 0,
+				"menu-open": store.state.appLoaded && store.state.sidebarOpen,
+				"menu-dragging": store.state.sidebarDragging,
+				"userlist-open": store.state.userlistOpen,
 			};
-		},
-	},
-	created() {
-		this.prepareOpenStates();
-	},
-	mounted() {
-		Mousetrap.bind("esc", this.escapeKey);
-		Mousetrap.bind("alt+u", this.toggleUserList);
-		Mousetrap.bind("alt+s", this.toggleSidebar);
-		Mousetrap.bind("alt+m", this.toggleMentions);
+		});
 
-		// Make a single throttled resize listener available to all components
-		this.debouncedResize = throttle(() => {
-			eventbus.emit("resize");
-		}, 100);
+		const debouncedResize = ref<DebouncedFunc<() => void>>();
+		const dayChangeTimeout = ref<any>();
 
-		window.addEventListener("resize", this.debouncedResize, {passive: true});
-
-		// Emit a daychange event every time the day changes so date markers know when to update themselves
-		const emitDayChange = () => {
-			eventbus.emit("daychange");
-			// This should always be 24h later but re-computing exact value just in case
-			this.dayChangeTimeout = setTimeout(emitDayChange, this.msUntilNextDay());
+		const escapeKey = () => {
+			eventbus.emit("escapekey");
 		};
 
-		this.dayChangeTimeout = setTimeout(emitDayChange, this.msUntilNextDay());
-	},
-	beforeDestroy() {
-		Mousetrap.unbind("esc", this.escapeKey);
-		Mousetrap.unbind("alt+u", this.toggleUserList);
-		Mousetrap.unbind("alt+s", this.toggleSidebar);
-		Mousetrap.unbind("alt+m", this.toggleMentions);
-
-		window.removeEventListener("resize", this.debouncedResize);
-		clearTimeout(this.dayChangeTimeout);
-	},
-	methods: {
-		escapeKey() {
-			eventbus.emit("escapekey");
-		},
-		toggleSidebar(e) {
+		const toggleSidebar = (e: ExtendedKeyboardEvent) => {
 			if (isIgnoredKeybind(e)) {
 				return true;
 			}
 
-			this.$store.commit("toggleSidebar");
+			store.commit("toggleSidebar");
 
 			return false;
-		},
-		toggleUserList(e) {
+		};
+
+		const toggleUserList = (e: ExtendedKeyboardEvent) => {
 			if (isIgnoredKeybind(e)) {
 				return true;
 			}
 
-			this.$store.commit("toggleUserlist");
+			store.commit("toggleUserlist");
 
 			return false;
-		},
-		toggleMentions() {
-			if (this.$store.state.networks.length !== 0) {
+		};
+
+		const toggleMentions = () => {
+			if (store.state.networks.length !== 0) {
 				eventbus.emit("mentions:toggle");
 			}
-		},
-		msUntilNextDay() {
+		};
+
+		const msUntilNextDay = () => {
 			// Compute how many milliseconds are remaining until the next day starts
 			const today = new Date();
-			const tommorow = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1);
+			const tommorow = new Date(
+				today.getFullYear(),
+				today.getMonth(),
+				today.getDate() + 1
+			).getTime();
 
-			return tommorow - today;
-		},
-		prepareOpenStates() {
+			return tommorow - today.getTime();
+		};
+
+		const prepareOpenStates = () => {
 			const viewportWidth = window.innerWidth;
 			let isUserlistOpen = storage.get("thelounge.state.userlist");
 
 			if (viewportWidth > constants.mobileViewportPixels) {
-				this.$store.commit(
-					"sidebarOpen",
-					storage.get("thelounge.state.sidebar") !== "false"
-				);
+				store.commit("sidebarOpen", storage.get("thelounge.state.sidebar") !== "false");
 			}
 
 			// If The Lounge is opened on a small screen (less than 1024px), and we don't have stored
@@ -134,8 +140,61 @@ export default {
 				isUserlistOpen = "true";
 			}
 
-			this.$store.commit("userlistOpen", isUserlistOpen === "true");
-		},
+			store.commit("userlistOpen", isUserlistOpen === "true");
+		};
+
+		prepareOpenStates();
+
+		onMounted(() => {
+			Mousetrap.bind("esc", escapeKey);
+			Mousetrap.bind("alt+u", toggleUserList);
+			Mousetrap.bind("alt+s", toggleSidebar);
+			Mousetrap.bind("alt+m", toggleMentions);
+
+			debouncedResize.value = throttle(() => {
+				eventbus.emit("resize");
+			}, 100);
+
+			window.addEventListener("resize", debouncedResize.value, {passive: true});
+
+			// Emit a daychange event every time the day changes so date markers know when to update themselves
+			const emitDayChange = () => {
+				eventbus.emit("daychange");
+				// This should always be 24h later but re-computing exact value just in case
+				dayChangeTimeout.value = setTimeout(emitDayChange, msUntilNextDay());
+			};
+
+			dayChangeTimeout.value = setTimeout(emitDayChange, msUntilNextDay());
+		});
+
+		onBeforeUnmount(() => {
+			Mousetrap.unbind("esc");
+			Mousetrap.unbind("alt+u");
+			Mousetrap.unbind("alt+s");
+			Mousetrap.unbind("alt+m");
+
+			if (debouncedResize.value) {
+				window.removeEventListener("resize", debouncedResize.value);
+			}
+
+			if (dayChangeTimeout.value) {
+				clearTimeout(dayChangeTimeout.value);
+			}
+		});
+
+		return {
+			viewportClasses,
+			escapeKey,
+			toggleSidebar,
+			toggleUserList,
+			toggleMentions,
+			store,
+			overlay,
+			loungeWindow,
+			imageViewer,
+			contextMenu,
+			confirmDialog,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Channel.vue b/client/components/Channel.vue
index 72551f9b..c21e55d2 100644
--- a/client/components/Channel.vue
+++ b/client/components/Channel.vue
@@ -1,4 +1,5 @@
 <template>
+	<!-- TODO: investigate -->
 	<ChannelWrapper ref="wrapper" v-bind="$props">
 		<span class="name">{{ channel.name }}</span>
 		<span
@@ -27,30 +28,38 @@
 	</ChannelWrapper>
 </template>
 
-<script>
+<script lang="ts">
+import {PropType, defineComponent, computed} from "vue";
 import roundBadgeNumber from "../js/helpers/roundBadgeNumber";
+import useCloseChannel from "../js/hooks/use-close-channel";
+import {ClientChan, ClientNetwork} from "../js/types";
 import ChannelWrapper from "./ChannelWrapper.vue";
 
-export default {
+export default defineComponent({
 	name: "Channel",
 	components: {
 		ChannelWrapper,
 	},
 	props: {
-		network: Object,
-		channel: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		channel: {
+			type: Object as PropType<ClientChan>,
+			required: true,
+		},
 		active: Boolean,
 		isFiltering: Boolean,
 	},
-	computed: {
-		unreadCount() {
-			return roundBadgeNumber(this.channel.unread);
-		},
+	setup(props) {
+		const unreadCount = computed(() => roundBadgeNumber(props.channel.unread));
+		const close = useCloseChannel(props.channel);
+
+		return {
+			unreadCount,
+			close,
+		};
 	},
-	methods: {
-		close() {
-			this.$root.closeChannel(this.channel);
-		},
-	},
-};
+});
 </script>
diff --git a/client/components/ChannelWrapper.vue b/client/components/ChannelWrapper.vue
index 572881bc..380b52af 100644
--- a/client/components/ChannelWrapper.vue
+++ b/client/components/ChannelWrapper.vue
@@ -23,72 +23,90 @@
 		:data-type="channel.type"
 		:aria-controls="'#chan-' + channel.id"
 		:aria-selected="active"
-		:style="channel.closed ? {transition: 'none', opacity: 0.4} : null"
+		:style="channel.closed ? {transition: 'none', opacity: 0.4} : undefined"
 		role="tab"
 		@click="click"
 		@contextmenu.prevent="openContextMenu"
 	>
-		<slot :network="network" :channel="channel" :activeChannel="activeChannel" />
+		<slot :network="network" :channel="channel" :active-channel="activeChannel" />
 	</div>
 </template>
 
-<script>
+<script lang="ts">
 import eventbus from "../js/eventbus";
 import isChannelCollapsed from "../js/helpers/isChannelCollapsed";
+import {ClientNetwork, ClientChan} from "../js/types";
+import {computed, defineComponent, PropType} from "vue";
+import {useStore} from "../js/store";
+import {switchToChannel} from "../js/router";
 
-export default {
+export default defineComponent({
 	name: "ChannelWrapper",
 	props: {
-		network: Object,
-		channel: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		channel: {
+			type: Object as PropType<ClientChan>,
+			required: true,
+		},
 		active: Boolean,
 		isFiltering: Boolean,
 	},
-	computed: {
-		activeChannel() {
-			return this.$store.state.activeChannel;
-		},
-		isChannelVisible() {
-			return this.isFiltering || !isChannelCollapsed(this.network, this.channel);
-		},
-	},
-	methods: {
-		getAriaLabel() {
-			const extra = [];
-			const type = this.channel.type;
+	setup(props) {
+		const store = useStore();
+		const activeChannel = computed(() => store.state.activeChannel);
+		const isChannelVisible = computed(
+			() => props.isFiltering || !isChannelCollapsed(props.network, props.channel)
+		);
 
-			if (this.channel.unread > 0) {
-				if (this.channel.unread > 1) {
-					extra.push(`${this.channel.unread} unread messages`);
+		const getAriaLabel = () => {
+			const extra: string[] = [];
+			const type = props.channel.type;
+
+			if (props.channel.unread > 0) {
+				if (props.channel.unread > 1) {
+					extra.push(`${props.channel.unread} unread messages`);
 				} else {
-					extra.push(`${this.channel.unread} unread message`);
+					extra.push(`${props.channel.unread} unread message`);
 				}
 			}
 
-			if (this.channel.highlight > 0) {
-				if (this.channel.highlight > 1) {
-					extra.push(`${this.channel.highlight} mentions`);
+			if (props.channel.highlight > 0) {
+				if (props.channel.highlight > 1) {
+					extra.push(`${props.channel.highlight} mentions`);
 				} else {
-					extra.push(`${this.channel.highlight} mention`);
+					extra.push(`${props.channel.highlight} mention`);
 				}
 			}
 
-			return `${type}: ${this.channel.name} ${extra.length ? `(${extra.join(", ")})` : ""}`;
-		},
-		click() {
-			if (this.isFiltering) {
+			return `${type}: ${props.channel.name} ${extra.length ? `(${extra.join(", ")})` : ""}`;
+		};
+
+		const click = () => {
+			if (props.isFiltering) {
 				return;
 			}
 
-			this.$root.switchToChannel(this.channel);
-		},
-		openContextMenu(event) {
+			switchToChannel(props.channel);
+		};
+
+		const openContextMenu = (event: MouseEvent) => {
 			eventbus.emit("contextmenu:channel", {
 				event: event,
-				channel: this.channel,
-				network: this.network,
+				channel: props.channel,
+				network: props.network,
 			});
-		},
+		};
+
+		return {
+			activeChannel,
+			isChannelVisible,
+			getAriaLabel,
+			click,
+			openContextMenu,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Chat.vue b/client/components/Chat.vue
index 9838d1b6..f1dfc51b 100644
--- a/client/components/Chat.vue
+++ b/client/components/Chat.vue
@@ -3,10 +3,10 @@
 		<div
 			id="chat"
 			:class="{
-				'hide-motd': !$store.state.settings.motd,
-				'colored-nicks': $store.state.settings.coloredNicks,
-				'time-seconds': $store.state.settings.showSeconds,
-				'time-12h': $store.state.settings.use12hClock,
+				'hide-motd': store.state.settings.motd,
+				'colored-nicks': store.state.settings.coloredNicks,
+				'time-seconds': store.state.settings.showSeconds,
+				'time-12h': store.state.settings.use12hClock,
 			}"
 		>
 			<div
@@ -47,7 +47,7 @@
 					/></span>
 					<MessageSearchForm
 						v-if="
-							$store.state.settings.searchEnabled &&
+							store.state.settings.searchEnabled &&
 							['channel', 'query'].includes(channel.type)
 						"
 						:network="network"
@@ -71,7 +71,7 @@
 						<button
 							class="rt"
 							aria-label="Toggle user list"
-							@click="$store.commit('toggleUserlist')"
+							@click="store.commit('toggleUserlist')"
 						/>
 					</span>
 				</div>
@@ -95,7 +95,7 @@
 							{'scroll-down-shown': !channel.scrolledToBottom},
 						]"
 						aria-label="Jump to recent messages"
-						@click="$refs.messageList.jumpToBottom()"
+						@click="messageList?.jumpToBottom()"
 					>
 						<div class="scroll-down-arrow" />
 					</div>
@@ -110,17 +110,17 @@
 			</div>
 		</div>
 		<div
-			v-if="$store.state.currentUserVisibleError"
+			v-if="store.state.currentUserVisibleError"
 			id="user-visible-error"
 			@click="hideUserVisibleError"
 		>
-			{{ $store.state.currentUserVisibleError }}
+			{{ store.state.currentUserVisibleError }}
 		</div>
 		<ChatInput :network="network" :channel="channel" />
 	</div>
 </template>
 
-<script>
+<script lang="ts">
 import socket from "../js/socket";
 import eventbus from "../js/eventbus";
 import ParsedMessage from "./ParsedMessage.vue";
@@ -133,8 +133,11 @@ import ListBans from "./Special/ListBans.vue";
 import ListInvites from "./Special/ListInvites.vue";
 import ListChannels from "./Special/ListChannels.vue";
 import ListIgnored from "./Special/ListIgnored.vue";
+import {defineComponent, PropType, ref, computed, watch, nextTick, onMounted, Component} from "vue";
+import type {ClientNetwork, ClientChan} from "../js/types";
+import {useStore} from "../js/store";
 
-export default {
+export default defineComponent({
 	name: "Chat",
 	components: {
 		ParsedMessage,
@@ -145,93 +148,126 @@ export default {
 		MessageSearchForm,
 	},
 	props: {
-		network: Object,
-		channel: Object,
-		focused: String,
+		network: {type: Object as PropType<ClientNetwork>, required: true},
+		channel: {type: Object as PropType<ClientChan>, required: true},
+		focused: Number,
 	},
-	computed: {
-		specialComponent() {
-			switch (this.channel.special) {
+	emits: ["channel-changed"],
+	setup(props, {emit}) {
+		const store = useStore();
+
+		const messageList = ref<typeof MessageList>();
+		const topicInput = ref<HTMLInputElement | null>(null);
+
+		const specialComponent = computed(() => {
+			switch (props.channel.special) {
 				case "list_bans":
-					return ListBans;
+					return ListBans as Component;
 				case "list_invites":
-					return ListInvites;
+					return ListInvites as Component;
 				case "list_channels":
-					return ListChannels;
+					return ListChannels as Component;
 				case "list_ignored":
-					return ListIgnored;
+					return ListIgnored as Component;
 			}
 
 			return undefined;
-		},
-	},
-	watch: {
-		channel() {
-			this.channelChanged();
-		},
-		"channel.editTopic"(newValue) {
-			if (newValue) {
-				this.$nextTick(() => {
-					this.$refs.topicInput.focus();
-				});
-			}
-		},
-	},
-	mounted() {
-		this.channelChanged();
+		});
 
-		if (this.channel.editTopic) {
-			this.$nextTick(() => {
-				this.$refs.topicInput.focus();
-			});
-		}
-	},
-	methods: {
-		channelChanged() {
+		const channelChanged = () => {
 			// Triggered when active channel is set or changed
-			this.channel.highlight = 0;
-			this.channel.unread = 0;
+			emit("channel-changed", props.channel);
 
-			socket.emit("open", this.channel.id);
+			socket.emit("open", props.channel.id);
 
-			if (this.channel.usersOutdated) {
-				this.channel.usersOutdated = false;
+			if (props.channel.usersOutdated) {
+				props.channel.usersOutdated = false;
 
 				socket.emit("names", {
-					target: this.channel.id,
+					target: props.channel.id,
 				});
 			}
-		},
-		hideUserVisibleError() {
-			this.$store.commit("currentUserVisibleError", null);
-		},
-		editTopic() {
-			if (this.channel.type === "channel") {
-				this.channel.editTopic = true;
-			}
-		},
-		saveTopic() {
-			this.channel.editTopic = false;
-			const newTopic = this.$refs.topicInput.value;
+		};
 
-			if (this.channel.topic !== newTopic) {
-				const target = this.channel.id;
-				const text = `/raw TOPIC ${this.channel.name} :${newTopic}`;
+		const hideUserVisibleError = () => {
+			store.commit("currentUserVisibleError", null);
+		};
+
+		const editTopic = () => {
+			if (props.channel.type === "channel") {
+				props.channel.editTopic = true;
+			}
+		};
+
+		const saveTopic = () => {
+			props.channel.editTopic = false;
+
+			if (!topicInput.value) {
+				return;
+			}
+
+			const newTopic = topicInput.value.value;
+
+			if (props.channel.topic !== newTopic) {
+				const target = props.channel.id;
+				const text = `/raw TOPIC ${props.channel.name} :${newTopic}`;
 				socket.emit("input", {target, text});
 			}
-		},
-		openContextMenu(event) {
+		};
+
+		const openContextMenu = (event: any) => {
 			eventbus.emit("contextmenu:channel", {
 				event: event,
-				channel: this.channel,
-				network: this.network,
+				channel: props.channel,
+				network: props.network,
 			});
-		},
-		openMentions(event) {
+		};
+
+		const openMentions = (event: any) => {
 			eventbus.emit("mentions:toggle", {
 				event: event,
 			});
-		},
+		};
+
+		watch(
+			() => props.channel,
+			() => {
+				channelChanged();
+			}
+		);
+
+		watch(
+			() => props.channel.editTopic,
+			(newTopic) => {
+				if (newTopic) {
+					void nextTick(() => {
+						topicInput.value?.focus();
+					});
+				}
+			}
+		);
+
+		onMounted(() => {
+			channelChanged();
+
+			if (props.channel.editTopic) {
+				void nextTick(() => {
+					topicInput.value?.focus();
+				});
+			}
+		});
+
+		return {
+			store,
+			messageList,
+			topicInput,
+			specialComponent,
+			hideUserVisibleError,
+			editTopic,
+			saveTopic,
+			openContextMenu,
+			openMentions,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/ChatInput.vue b/client/components/ChatInput.vue
index 401ee7ef..e89ef276 100644
--- a/client/components/ChatInput.vue
+++ b/client/components/ChatInput.vue
@@ -16,7 +16,7 @@
 			@blur="onBlur"
 		/>
 		<span
-			v-if="$store.state.serverConfiguration.fileUpload"
+			v-if="store.state.serverConfiguration?.fileUpload"
 			id="upload-tooltip"
 			class="tooltipped tooltipped-w tooltipped-no-touch"
 			aria-label="Upload file"
@@ -34,7 +34,7 @@
 				id="upload"
 				type="button"
 				aria-label="Upload file"
-				:disabled="!$store.state.isConnected"
+				:disabled="!store.state.isConnected"
 			/>
 		</span>
 		<span
@@ -46,13 +46,13 @@
 				id="submit"
 				type="submit"
 				aria-label="Send message"
-				:disabled="!$store.state.isConnected"
+				:disabled="!store.state.isConnected"
 			/>
 		</span>
 	</form>
 </template>
 
-<script>
+<script lang="ts">
 import Mousetrap from "mousetrap";
 import {wrapCursor} from "undate";
 import autocompletion from "../js/autocompletion";
@@ -60,6 +60,9 @@ import commands from "../js/commands/index";
 import socket from "../js/socket";
 import upload from "../js/upload";
 import eventbus from "../js/eventbus";
+import {watch, defineComponent, nextTick, onMounted, PropType, ref, onUnmounted} from "vue";
+import type {ClientNetwork, ClientChan} from "../js/types";
+import {useStore} from "../js/store";
 
 const formattingHotkeys = {
 	"mod+k": "\x03",
@@ -86,178 +89,101 @@ const bracketWraps = {
 	_: "_",
 };
 
-let autocompletionRef = null;
-
-export default {
+export default defineComponent({
 	name: "ChatInput",
 	props: {
-		network: Object,
-		channel: Object,
+		network: {type: Object as PropType<ClientNetwork>, required: true},
+		channel: {type: Object as PropType<ClientChan>, required: true},
 	},
-	watch: {
-		"channel.id"() {
-			if (autocompletionRef) {
-				autocompletionRef.hide();
-			}
-		},
-		"channel.pendingMessage"() {
-			this.setInputSize();
-		},
-	},
-	mounted() {
-		eventbus.on("escapekey", this.blurInput);
+	setup(props) {
+		const store = useStore();
+		const input = ref<HTMLTextAreaElement>();
+		const uploadInput = ref<HTMLInputElement>();
+		const autocompletionRef = ref<ReturnType<typeof autocompletion>>();
 
-		if (this.$store.state.settings.autocomplete) {
-			autocompletionRef = autocompletion(this.$refs.input);
-		}
-
-		const inputTrap = Mousetrap(this.$refs.input);
-
-		inputTrap.bind(Object.keys(formattingHotkeys), function (e, key) {
-			const modifier = formattingHotkeys[key];
-
-			wrapCursor(
-				e.target,
-				modifier,
-				e.target.selectionStart === e.target.selectionEnd ? "" : modifier
-			);
-
-			return false;
-		});
-
-		inputTrap.bind(Object.keys(bracketWraps), function (e, key) {
-			if (e.target.selectionStart !== e.target.selectionEnd) {
-				wrapCursor(e.target, key, bracketWraps[key]);
-
-				return false;
-			}
-		});
-
-		inputTrap.bind(["up", "down"], (e, key) => {
-			if (
-				this.$store.state.isAutoCompleting ||
-				e.target.selectionStart !== e.target.selectionEnd
-			) {
-				return;
-			}
-
-			const onRow = (
-				this.$refs.input.value.slice(null, this.$refs.input.selectionStart).match(/\n/g) ||
-				[]
-			).length;
-			const totalRows = (this.$refs.input.value.match(/\n/g) || []).length;
-
-			const {channel} = this;
-
-			if (channel.inputHistoryPosition === 0) {
-				channel.inputHistory[channel.inputHistoryPosition] = channel.pendingMessage;
-			}
-
-			if (key === "up" && onRow === 0) {
-				if (channel.inputHistoryPosition < channel.inputHistory.length - 1) {
-					channel.inputHistoryPosition++;
-				} else {
-					return;
-				}
-			} else if (key === "down" && channel.inputHistoryPosition > 0 && onRow === totalRows) {
-				channel.inputHistoryPosition--;
-			} else {
-				return;
-			}
-
-			channel.pendingMessage = channel.inputHistory[channel.inputHistoryPosition];
-			this.$refs.input.value = channel.pendingMessage;
-			this.setInputSize();
-
-			return false;
-		});
-
-		if (this.$store.state.serverConfiguration.fileUpload) {
-			upload.mounted();
-		}
-	},
-	destroyed() {
-		eventbus.off("escapekey", this.blurInput);
-
-		if (autocompletionRef) {
-			autocompletionRef.destroy();
-			autocompletionRef = null;
-		}
-
-		upload.abort();
-	},
-	methods: {
-		setPendingMessage(e) {
-			this.channel.pendingMessage = e.target.value;
-			this.channel.inputHistoryPosition = 0;
-			this.setInputSize();
-		},
-		setInputSize() {
-			this.$nextTick(() => {
-				if (!this.$refs.input) {
+		const setInputSize = () => {
+			void nextTick(() => {
+				if (!input.value) {
 					return;
 				}
 
-				const style = window.getComputedStyle(this.$refs.input);
-				const lineHeight = parseFloat(style.lineHeight, 10) || 1;
+				const style = window.getComputedStyle(input.value);
+				const lineHeight = parseFloat(style.lineHeight) || 1;
 
 				// Start by resetting height before computing as scrollHeight does not
 				// decrease when deleting characters
-				this.$refs.input.style.height = "";
+				input.value.style.height = "";
 
 				// Use scrollHeight to calculate how many lines there are in input, and ceil the value
 				// because some browsers tend to incorrently round the values when using high density
 				// displays or using page zoom feature
-				this.$refs.input.style.height =
-					Math.ceil(this.$refs.input.scrollHeight / lineHeight) * lineHeight + "px";
+				input.value.style.height = `${
+					Math.ceil(input.value.scrollHeight / lineHeight) * lineHeight
+				}px`;
 			});
-		},
-		getInputPlaceholder(channel) {
+		};
+
+		const setPendingMessage = (e: Event) => {
+			props.channel.pendingMessage = (e.target as HTMLInputElement).value;
+			props.channel.inputHistoryPosition = 0;
+			setInputSize();
+		};
+
+		const getInputPlaceholder = (channel: ClientChan) => {
 			if (channel.type === "channel" || channel.type === "query") {
 				return `Write to ${channel.name}`;
 			}
 
 			return "";
-		},
-		onSubmit() {
+		};
+
+		const onSubmit = () => {
+			if (!input.value) {
+				return;
+			}
+
 			// Triggering click event opens the virtual keyboard on mobile
 			// This can only be called from another interactive event (e.g. button click)
-			this.$refs.input.click();
-			this.$refs.input.focus();
+			input.value.click();
+			input.value.focus();
 
-			if (!this.$store.state.isConnected) {
+			if (!store.state.isConnected) {
 				return false;
 			}
 
-			const target = this.channel.id;
-			const text = this.channel.pendingMessage;
+			const target = props.channel.id;
+			const text = props.channel.pendingMessage;
 
 			if (text.length === 0) {
 				return false;
 			}
 
-			if (autocompletionRef) {
-				autocompletionRef.hide();
+			if (autocompletionRef.value) {
+				autocompletionRef.value.hide();
 			}
 
-			this.channel.inputHistoryPosition = 0;
-			this.channel.pendingMessage = "";
-			this.$refs.input.value = "";
-			this.setInputSize();
+			props.channel.inputHistoryPosition = 0;
+			props.channel.pendingMessage = "";
+			input.value.value = "";
+			setInputSize();
 
 			// Store new message in history if last message isn't already equal
-			if (this.channel.inputHistory[1] !== text) {
-				this.channel.inputHistory.splice(1, 0, text);
+			if (props.channel.inputHistory[1] !== text) {
+				props.channel.inputHistory.splice(1, 0, text);
 			}
 
 			// Limit input history to a 100 entries
-			if (this.channel.inputHistory.length > 100) {
-				this.channel.inputHistory.pop();
+			if (props.channel.inputHistory.length > 100) {
+				props.channel.inputHistory.pop();
 			}
 
 			if (text[0] === "/") {
-				const args = text.substr(1).split(" ");
-				const cmd = args.shift().toLowerCase();
+				const args = text.substring(1).split(" ");
+				const cmd = args.shift()?.toLowerCase();
+
+				if (!cmd) {
+					return false;
+				}
 
 				if (
 					Object.prototype.hasOwnProperty.call(commands, cmd) &&
@@ -268,23 +194,166 @@ export default {
 			}
 
 			socket.emit("input", {target, text});
-		},
-		onUploadInputChange() {
-			const files = Array.from(this.$refs.uploadInput.files);
-			upload.triggerUpload(files);
-			this.$refs.uploadInput.value = ""; // Reset <input> element so you can upload the same file
-		},
-		openFileUpload() {
-			this.$refs.uploadInput.click();
-		},
-		blurInput() {
-			this.$refs.input.blur();
-		},
-		onBlur() {
-			if (autocompletionRef) {
-				autocompletionRef.hide();
+		};
+
+		const onUploadInputChange = () => {
+			if (!uploadInput.value || !uploadInput.value.files) {
+				return;
 			}
-		},
+
+			const files = Array.from(uploadInput.value.files);
+			upload.triggerUpload(files);
+			uploadInput.value.value = ""; // Reset <input> element so you can upload the same file
+		};
+
+		const openFileUpload = () => {
+			uploadInput.value?.click();
+		};
+
+		const blurInput = () => {
+			input.value?.blur();
+		};
+
+		const onBlur = () => {
+			if (autocompletionRef.value) {
+				autocompletionRef.value.hide();
+			}
+		};
+
+		watch(
+			() => props.channel.id,
+			() => {
+				if (autocompletionRef.value) {
+					autocompletionRef.value.hide();
+				}
+			}
+		);
+
+		watch(
+			() => props.channel.pendingMessage,
+			() => {
+				setInputSize();
+			}
+		);
+
+		onMounted(() => {
+			eventbus.on("escapekey", blurInput);
+
+			if (store.state.settings.autocomplete) {
+				if (!input.value) {
+					throw new Error("ChatInput autocomplete: input element is not available");
+				}
+
+				autocompletionRef.value = autocompletion(input.value);
+			}
+
+			const inputTrap = Mousetrap(input.value);
+
+			inputTrap.bind(Object.keys(formattingHotkeys), function (e, key) {
+				const modifier = formattingHotkeys[key];
+
+				if (!e.target) {
+					return;
+				}
+
+				wrapCursor(
+					e.target as HTMLTextAreaElement,
+					modifier,
+					(e.target as HTMLTextAreaElement).selectionStart ===
+						(e.target as HTMLTextAreaElement).selectionEnd
+						? ""
+						: modifier
+				);
+
+				return false;
+			});
+
+			inputTrap.bind(Object.keys(bracketWraps), function (e, key) {
+				if (
+					(e.target as HTMLTextAreaElement)?.selectionStart !==
+					(e.target as HTMLTextAreaElement).selectionEnd
+				) {
+					wrapCursor(e.target as HTMLTextAreaElement, key, bracketWraps[key]);
+
+					return false;
+				}
+			});
+
+			inputTrap.bind(["up", "down"], (e, key) => {
+				if (
+					store.state.isAutoCompleting ||
+					(e.target as HTMLTextAreaElement).selectionStart !==
+						(e.target as HTMLTextAreaElement).selectionEnd ||
+					!input.value
+				) {
+					return;
+				}
+
+				const onRow = (
+					input.value.value.slice(undefined, input.value.selectionStart).match(/\n/g) ||
+					[]
+				).length;
+				const totalRows = (input.value.value.match(/\n/g) || []).length;
+
+				const {channel} = props;
+
+				if (channel.inputHistoryPosition === 0) {
+					channel.inputHistory[channel.inputHistoryPosition] = channel.pendingMessage;
+				}
+
+				if (key === "up" && onRow === 0) {
+					if (channel.inputHistoryPosition < channel.inputHistory.length - 1) {
+						channel.inputHistoryPosition++;
+					} else {
+						return;
+					}
+				} else if (
+					key === "down" &&
+					channel.inputHistoryPosition > 0 &&
+					onRow === totalRows
+				) {
+					channel.inputHistoryPosition--;
+				} else {
+					return;
+				}
+
+				channel.pendingMessage = channel.inputHistory[channel.inputHistoryPosition];
+				input.value.value = channel.pendingMessage;
+				setInputSize();
+
+				return false;
+			});
+
+			if (store.state.serverConfiguration?.fileUpload) {
+				upload.mounted();
+			}
+		});
+
+		onUnmounted(() => {
+			eventbus.off("escapekey", blurInput);
+
+			if (autocompletionRef.value) {
+				autocompletionRef.value.destroy();
+				autocompletionRef.value = undefined;
+			}
+
+			upload.abort();
+		});
+
+		return {
+			store,
+			input,
+			uploadInput,
+			onUploadInputChange,
+			openFileUpload,
+			blurInput,
+			onBlur,
+			setInputSize,
+			upload,
+			getInputPlaceholder,
+			onSubmit,
+			setPendingMessage,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/ChatUserList.vue b/client/components/ChatUserList.vue
index 7eaa7c8b..ec3c971b 100644
--- a/client/components/ChatUserList.vue
+++ b/client/components/ChatUserList.vue
@@ -28,9 +28,10 @@
 			<div
 				v-for="(users, mode) in groupedUsers"
 				:key="mode"
-				:class="['user-mode', getModeClass(mode)]"
+				:class="['user-mode', getModeClass(String(mode))]"
 			>
 				<template v-if="userSearchInput.length > 0">
+					<!-- eslint-disable vue/no-v-text-v-html-on-component -->
 					<Username
 						v-for="user in users"
 						:key="user.original.nick + '-search'"
@@ -39,6 +40,7 @@
 						:user="user.original"
 						v-html="user.string"
 					/>
+					<!-- eslint-enable -->
 				</template>
 				<template v-else>
 					<Username
@@ -54,8 +56,11 @@
 	</aside>
 </template>
 
-<script>
+<script lang="ts">
 import {filter as fuzzyFilter} from "fuzzy";
+import {computed, defineComponent, nextTick, PropType, ref} from "vue";
+import type {UserInMessage} from "../../server/models/msg";
+import type {ClientChan, ClientUser} from "../js/types";
 import Username from "./Username.vue";
 
 const modes = {
@@ -68,39 +73,35 @@ const modes = {
 	"": "normal",
 };
 
-export default {
+export default defineComponent({
 	name: "ChatUserList",
 	components: {
 		Username,
 	},
 	props: {
-		channel: Object,
+		channel: {type: Object as PropType<ClientChan>, required: true},
 	},
-	data() {
-		return {
-			userSearchInput: "",
-			activeUser: null,
-		};
-	},
-	computed: {
-		// filteredUsers is computed, to avoid unnecessary filtering
-		// as it is shared between filtering and keybindings.
-		filteredUsers() {
-			if (!this.userSearchInput) {
+	setup(props) {
+		const userSearchInput = ref("");
+		const activeUser = ref<UserInMessage | null>();
+		const userlist = ref<HTMLDivElement>();
+		const filteredUsers = computed(() => {
+			if (!userSearchInput.value) {
 				return;
 			}
 
-			return fuzzyFilter(this.userSearchInput, this.channel.users, {
+			return fuzzyFilter(userSearchInput.value, props.channel.users, {
 				pre: "<b>",
 				post: "</b>",
 				extract: (u) => u.nick,
 			});
-		},
-		groupedUsers() {
+		});
+
+		const groupedUsers = computed(() => {
 			const groups = {};
 
-			if (this.userSearchInput) {
-				const result = this.filteredUsers;
+			if (userSearchInput.value && filteredUsers.value) {
+				const result = filteredUsers.value;
 
 				for (const user of result) {
 					const mode = user.original.modes[0] || "";
@@ -115,7 +116,7 @@ export default {
 					groups[mode].push(user);
 				}
 			} else {
-				for (const user of this.channel.users) {
+				for (const user of props.channel.users) {
 					const mode = user.modes[0] || "";
 
 					if (!groups[mode]) {
@@ -126,24 +127,35 @@ export default {
 				}
 			}
 
-			return groups;
-		},
-	},
-	methods: {
-		setUserSearchInput(e) {
-			this.userSearchInput = e.target.value;
-		},
-		getModeClass(mode) {
-			return modes[mode];
-		},
-		selectUser() {
+			return groups as {
+				[mode: string]: (ClientUser & {
+					original: UserInMessage;
+					string: string;
+				})[];
+			};
+		});
+
+		const setUserSearchInput = (e: Event) => {
+			userSearchInput.value = (e.target as HTMLInputElement).value;
+		};
+
+		const getModeClass = (mode: string) => {
+			return modes[mode] as typeof modes;
+		};
+
+		const selectUser = () => {
 			// Simulate a click on the active user to open the context menu.
 			// Coordinates are provided to position the menu correctly.
-			if (!this.activeUser) {
+			if (!activeUser.value || !userlist.value) {
+				return;
+			}
+
+			const el = userlist.value.querySelector(".active");
+
+			if (!el) {
 				return;
 			}
 
-			const el = this.$refs.userlist.querySelector(".active");
 			const rect = el.getBoundingClientRect();
 			const ev = new MouseEvent("click", {
 				view: window,
@@ -153,38 +165,58 @@ export default {
 				clientY: rect.top + rect.height,
 			});
 			el.dispatchEvent(ev);
-		},
-		hoverUser(user) {
-			this.activeUser = user;
-		},
-		removeHoverUser() {
-			this.activeUser = null;
-		},
-		navigateUserList(event, direction) {
+		};
+
+		const hoverUser = (user: UserInMessage) => {
+			activeUser.value = user;
+		};
+
+		const removeHoverUser = () => {
+			activeUser.value = null;
+		};
+
+		const scrollToActiveUser = () => {
+			// Scroll the list if needed after the active class is applied
+			void nextTick(() => {
+				const el = userlist.value?.querySelector(".active");
+				el?.scrollIntoView({block: "nearest", inline: "nearest"});
+			});
+		};
+
+		const navigateUserList = (event: Event, direction: number) => {
 			// Prevent propagation to stop global keybind handler from capturing pagedown/pageup
 			// and redirecting it to the message list container for scrolling
 			event.stopImmediatePropagation();
 			event.preventDefault();
 
-			let users = this.channel.users;
+			let users = props.channel.users;
 
 			// Only using filteredUsers when we have to avoids filtering when it's not needed
-			if (this.userSearchInput) {
-				users = this.filteredUsers.map((result) => result.original);
+			if (userSearchInput.value && filteredUsers.value) {
+				users = filteredUsers.value.map((result) => result.original);
 			}
 
 			// Bail out if there's no users to select
 			if (!users.length) {
-				this.activeUser = null;
+				activeUser.value = null;
 				return;
 			}
 
-			let currentIndex = users.indexOf(this.activeUser);
+			const abort = () => {
+				activeUser.value = direction ? users[0] : users[users.length - 1];
+				scrollToActiveUser();
+			};
 
 			// If there's no active user select the first or last one depending on direction
-			if (!this.activeUser || currentIndex === -1) {
-				this.activeUser = direction ? users[0] : users[users.length - 1];
-				this.scrollToActiveUser();
+			if (!activeUser.value) {
+				abort();
+				return;
+			}
+
+			let currentIndex = users.indexOf(activeUser.value as ClientUser);
+
+			if (currentIndex === -1) {
+				abort();
 				return;
 			}
 
@@ -200,16 +232,24 @@ export default {
 				currentIndex -= users.length;
 			}
 
-			this.activeUser = users[currentIndex];
-			this.scrollToActiveUser();
-		},
-		scrollToActiveUser() {
-			// Scroll the list if needed after the active class is applied
-			this.$nextTick(() => {
-				const el = this.$refs.userlist.querySelector(".active");
-				el.scrollIntoView({block: "nearest", inline: "nearest"});
-			});
-		},
+			activeUser.value = users[currentIndex];
+			scrollToActiveUser();
+		};
+
+		return {
+			filteredUsers,
+			groupedUsers,
+			userSearchInput,
+			activeUser,
+			userlist,
+
+			setUserSearchInput,
+			getModeClass,
+			selectUser,
+			hoverUser,
+			removeHoverUser,
+			navigateUserList,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/ConfirmDialog.vue b/client/components/ConfirmDialog.vue
index af92e368..17691cad 100644
--- a/client/components/ConfirmDialog.vue
+++ b/client/components/ConfirmDialog.vue
@@ -1,13 +1,13 @@
 <template>
-	<div id="confirm-dialog-overlay" :class="{opened: data !== null}">
+	<div id="confirm-dialog-overlay" :class="{opened: !!data}">
 		<div v-if="data !== null" id="confirm-dialog">
 			<div class="confirm-text">
-				<div class="confirm-text-title">{{ data.title }}</div>
-				<p>{{ data.text }}</p>
+				<div class="confirm-text-title">{{ data?.title }}</div>
+				<p>{{ data?.text }}</p>
 			</div>
 			<div class="confirm-buttons">
 				<button class="btn btn-cancel" @click="close(false)">Cancel</button>
-				<button class="btn btn-danger" @click="close(true)">{{ data.button }}</button>
+				<button class="btn btn-danger" @click="close(true)">{{ data?.button }}</button>
 			</div>
 		</div>
 	</div>
@@ -50,37 +50,53 @@
 }
 </style>
 
-<script>
+<script lang="ts">
 import eventbus from "../js/eventbus";
+import {defineComponent, onMounted, onUnmounted, ref} from "vue";
 
-export default {
+type ConfirmDialogData = {
+	title: string;
+	text: string;
+	button: string;
+};
+
+type ConfirmDialogCallback = {
+	(confirmed: boolean): void;
+};
+
+export default defineComponent({
 	name: "ConfirmDialog",
-	data() {
+	setup() {
+		const data = ref<ConfirmDialogData>();
+		const callback = ref<ConfirmDialogCallback>();
+
+		const open = (incoming: ConfirmDialogData, cb: ConfirmDialogCallback) => {
+			data.value = incoming;
+			callback.value = cb;
+		};
+
+		const close = (result: boolean) => {
+			data.value = undefined;
+
+			if (callback.value) {
+				callback.value(!!result);
+			}
+		};
+
+		onMounted(() => {
+			eventbus.on("escapekey", close);
+			eventbus.on("confirm-dialog", open);
+		});
+
+		onUnmounted(() => {
+			eventbus.off("escapekey", close);
+			eventbus.off("confirm-dialog", open);
+		});
+
 		return {
-			data: null,
-			callback: null,
+			data,
+			close,
 		};
 	},
-	mounted() {
-		eventbus.on("escapekey", this.close);
-		eventbus.on("confirm-dialog", this.open);
-	},
-	destroyed() {
-		eventbus.off("escapekey", this.close);
-		eventbus.off("confirm-dialog", this.open);
-	},
-	methods: {
-		open(data, callback) {
-			this.data = data;
-			this.callback = callback;
-		},
-		close(result) {
-			this.data = null;
-
-			if (this.callback) {
-				this.callback(!!result);
-			}
-		},
-	},
-};
+});
 </script>
diff --git a/client/components/ContextMenu.vue b/client/components/ContextMenu.vue
index 60ff51be..8a51fc5c 100644
--- a/client/components/ContextMenu.vue
+++ b/client/components/ContextMenu.vue
@@ -14,14 +14,17 @@
 			id="context-menu"
 			ref="contextMenu"
 			role="menu"
-			:style="style"
+			:style="{
+				top: style.top + 'px',
+				left: style.left + 'px',
+			}"
 			tabindex="-1"
 			@mouseleave="activeItem = -1"
 			@keydown.enter.prevent="clickActiveItem"
 		>
-			<template v-for="(item, id) of items">
+			<!-- TODO: type -->
+			<template v-for="(item, id) of (items as any)" :key="item.name">
 				<li
-					:key="item.name"
 					:class="[
 						'context-menu-' + item.type,
 						item.class ? 'context-menu-' + item.class : null,
@@ -38,164 +41,77 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
 import {
 	generateUserContextMenu,
 	generateChannelContextMenu,
 	generateInlineChannelContextMenu,
-} from "../js/helpers/contextMenu.js";
+	ContextMenuItem,
+} from "../js/helpers/contextMenu";
 import eventbus from "../js/eventbus";
+import {defineComponent, nextTick, onMounted, onUnmounted, PropType, ref} from "vue";
+import {ClientChan, ClientMessage, ClientNetwork, ClientUser} from "../js/types";
+import {useStore} from "../js/store";
+import {useRouter} from "vue-router";
 
-export default {
+export default defineComponent({
 	name: "ContextMenu",
 	props: {
-		message: Object,
+		message: {
+			required: false,
+			type: Object as PropType<ClientMessage>,
+		},
 	},
-	data() {
-		return {
-			isOpen: false,
-			passthrough: false,
-			previousActiveElement: null,
-			items: [],
-			activeItem: -1,
-			style: {
-				left: 0,
-				top: 0,
-			},
-		};
-	},
-	mounted() {
-		eventbus.on("escapekey", this.close);
-		eventbus.on("contextmenu:cancel", this.close);
-		eventbus.on("contextmenu:user", this.openUserContextMenu);
-		eventbus.on("contextmenu:channel", this.openChannelContextMenu);
-		eventbus.on("contextmenu:inline-channel", this.openInlineChannelContextMenu);
-	},
-	destroyed() {
-		eventbus.off("escapekey", this.close);
-		eventbus.off("contextmenu:cancel", this.close);
-		eventbus.off("contextmenu:user", this.openUserContextMenu);
-		eventbus.off("contextmenu:channel", this.openChannelContextMenu);
-		eventbus.off("contextmenu:inline-channel", this.openInlineChannelContextMenu);
+	setup() {
+		const store = useStore();
+		const router = useRouter();
 
-		this.close();
-	},
-	methods: {
-		enablePointerEvents() {
-			this.passthrough = false;
-			document.body.removeEventListener("pointerup", this.enablePointerEvents, {
-				passive: true,
-			});
-		},
-		openChannelContextMenu(data) {
-			if (data.event.type === "contextmenu") {
-				// Pass through all pointer events to allow the network list's
-				// dragging events to continue triggering.
-				this.passthrough = true;
-				document.body.addEventListener("pointerup", this.enablePointerEvents, {
-					passive: true,
-				});
-			}
+		const isOpen = ref(false);
+		const passthrough = ref(false);
 
-			const items = generateChannelContextMenu(this.$root, data.channel, data.network);
-			this.open(data.event, items);
-		},
-		openInlineChannelContextMenu(data) {
-			const {network} = this.$store.state.activeChannel;
-			const items = generateInlineChannelContextMenu(this.$root, data.channel, network);
-			this.open(data.event, items);
-		},
-		openUserContextMenu(data) {
-			const {network, channel} = this.$store.state.activeChannel;
+		const contextMenu = ref<HTMLUListElement | null>();
+		const previousActiveElement = ref<HTMLElement | null>();
+		const items = ref<ContextMenuItem[]>([]);
+		const activeItem = ref(-1);
+		const style = ref({
+			top: 0,
+			left: 0,
+		});
 
-			const items = generateUserContextMenu(
-				this.$root,
-				channel,
-				network,
-				channel.users.find((u) => u.nick === data.user.nick) || {
-					nick: data.user.nick,
-					modes: [],
-				}
-			);
-			this.open(data.event, items);
-		},
-		open(event, items) {
-			event.preventDefault();
-
-			this.previousActiveElement = document.activeElement;
-			this.items = items;
-			this.activeItem = 0;
-			this.isOpen = true;
-
-			// Position the menu and set the focus on the first item after it's size has updated
-			this.$nextTick(() => {
-				const pos = this.positionContextMenu(event);
-				this.style.left = pos.left + "px";
-				this.style.top = pos.top + "px";
-				this.$refs.contextMenu.focus();
-			});
-		},
-		close() {
-			if (!this.isOpen) {
+		const close = () => {
+			if (!isOpen.value) {
 				return;
 			}
 
-			this.isOpen = false;
-			this.items = [];
+			isOpen.value = false;
+			items.value = [];
 
-			if (this.previousActiveElement) {
-				this.previousActiveElement.focus();
-				this.previousActiveElement = null;
+			if (previousActiveElement.value) {
+				previousActiveElement.value.focus();
+				previousActiveElement.value = null;
 			}
-		},
-		hoverItem(id) {
-			this.activeItem = id;
-		},
-		clickItem(item) {
-			this.close();
+		};
 
-			if (item.action) {
-				item.action();
-			} else if (item.link) {
-				this.$router.push(item.link);
-			}
-		},
-		clickActiveItem() {
-			if (this.items[this.activeItem]) {
-				this.clickItem(this.items[this.activeItem]);
-			}
-		},
-		navigateMenu(direction) {
-			let currentIndex = this.activeItem;
+		const enablePointerEvents = () => {
+			passthrough.value = false;
+			document.body.removeEventListener("pointerup", enablePointerEvents);
+		};
 
-			currentIndex += direction;
-
-			const nextItem = this.items[currentIndex];
-
-			// If the next item we would select is a divider, skip over it
-			if (nextItem && nextItem.type === "divider") {
-				currentIndex += direction;
-			}
-
-			if (currentIndex < 0) {
-				currentIndex += this.items.length;
-			}
-
-			if (currentIndex > this.items.length - 1) {
-				currentIndex -= this.items.length;
-			}
-
-			this.activeItem = currentIndex;
-		},
-		containerClick(event) {
+		const containerClick = (event: MouseEvent) => {
 			if (event.currentTarget === event.target) {
-				this.close();
+				close();
 			}
-		},
-		positionContextMenu(event) {
-			const element = event.target;
-			const menuWidth = this.$refs.contextMenu.offsetWidth;
-			const menuHeight = this.$refs.contextMenu.offsetHeight;
+		};
+
+		const positionContextMenu = (event: MouseEvent) => {
+			const element = event.target as HTMLElement;
+
+			if (!contextMenu.value) {
+				return;
+			}
+
+			const menuWidth = contextMenu.value?.offsetWidth;
+			const menuHeight = contextMenu.value?.offsetHeight;
 
 			if (element && element.classList.contains("menu")) {
 				return {
@@ -215,7 +131,154 @@ export default {
 			}
 
 			return offset;
-		},
+		};
+
+		const hoverItem = (id: number) => {
+			activeItem.value = id;
+		};
+
+		const clickItem = (item: ContextMenuItem) => {
+			close();
+
+			if ("action" in item && item.action) {
+				item.action();
+			} else if ("link" in item && item.link) {
+				router.push(item.link).catch(() => {
+					// eslint-disable-next-line no-console
+					console.error("Failed to navigate to", item.link);
+				});
+			}
+		};
+
+		const clickActiveItem = () => {
+			if (items.value[activeItem.value]) {
+				clickItem(items.value[activeItem.value]);
+			}
+		};
+
+		const open = (event: MouseEvent, newItems: ContextMenuItem[]) => {
+			event.preventDefault();
+
+			previousActiveElement.value = document.activeElement as HTMLElement;
+			items.value = newItems;
+			activeItem.value = 0;
+			isOpen.value = true;
+
+			// Position the menu and set the focus on the first item after it's size has updated
+			nextTick(() => {
+				const pos = positionContextMenu(event);
+
+				if (!pos) {
+					return;
+				}
+
+				style.value.left = pos.left;
+				style.value.top = pos.top;
+				contextMenu.value?.focus();
+			}).catch((e) => {
+				// eslint-disable-next-line no-console
+				console.error(e);
+			});
+		};
+
+		const openChannelContextMenu = (data: {
+			event: MouseEvent;
+			channel: ClientChan;
+			network: ClientNetwork;
+		}) => {
+			if (data.event.type === "contextmenu") {
+				// Pass through all pointer events to allow the network list's
+				// dragging events to continue triggering.
+				passthrough.value = true;
+				document.body.addEventListener("pointerup", enablePointerEvents, {
+					passive: true,
+				});
+			}
+
+			const newItems = generateChannelContextMenu(data.channel, data.network);
+			open(data.event, newItems);
+		};
+
+		const openInlineChannelContextMenu = (data: {channel: string; event: MouseEvent}) => {
+			const {network} = store.state.activeChannel;
+			const newItems = generateInlineChannelContextMenu(store, data.channel, network);
+
+			open(data.event, newItems);
+		};
+
+		const openUserContextMenu = (data: {
+			user: Pick<ClientUser, "nick" | "modes">;
+			event: MouseEvent;
+		}) => {
+			const {network, channel} = store.state.activeChannel;
+
+			const newItems = generateUserContextMenu(
+				store,
+				channel,
+				network,
+				channel.users.find((u) => u.nick === data.user.nick) || {
+					nick: data.user.nick,
+					modes: [],
+				}
+			);
+			open(data.event, newItems);
+		};
+
+		const navigateMenu = (direction: number) => {
+			let currentIndex = activeItem.value;
+
+			currentIndex += direction;
+
+			const nextItem = items.value[currentIndex];
+
+			// If the next item we would select is a divider, skip over it
+			if (nextItem && "type" in nextItem && nextItem.type === "divider") {
+				currentIndex += direction;
+			}
+
+			if (currentIndex < 0) {
+				currentIndex += items.value.length;
+			}
+
+			if (currentIndex > items.value.length - 1) {
+				currentIndex -= items.value.length;
+			}
+
+			activeItem.value = currentIndex;
+		};
+
+		onMounted(() => {
+			eventbus.on("escapekey", close);
+			eventbus.on("contextmenu:cancel", close);
+			eventbus.on("contextmenu:user", openUserContextMenu);
+			eventbus.on("contextmenu:channel", openChannelContextMenu);
+			eventbus.on("contextmenu:inline-channel", openInlineChannelContextMenu);
+		});
+
+		onUnmounted(() => {
+			eventbus.off("escapekey", close);
+			eventbus.off("contextmenu:cancel", close);
+			eventbus.off("contextmenu:user", openUserContextMenu);
+			eventbus.off("contextmenu:channel", openChannelContextMenu);
+			eventbus.off("contextmenu:inline-channel", openInlineChannelContextMenu);
+
+			close();
+		});
+
+		return {
+			isOpen,
+			items,
+			activeItem,
+			style,
+			contextMenu,
+			passthrough,
+			close,
+			containerClick,
+			navigateMenu,
+			hoverItem,
+			clickItem,
+			clickActiveItem,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/DateMarker.vue b/client/components/DateMarker.vue
index 4b6fa37c..4125465c 100644
--- a/client/components/DateMarker.vue
+++ b/client/components/DateMarker.vue
@@ -6,52 +6,61 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
 import dayjs from "dayjs";
 import calendar from "dayjs/plugin/calendar";
+import {computed, defineComponent, onBeforeUnmount, onMounted, PropType} from "vue";
 import eventbus from "../js/eventbus";
+import type {ClientMessage} from "../js/types";
 
 dayjs.extend(calendar);
 
-export default {
+export default defineComponent({
 	name: "DateMarker",
 	props: {
-		message: Object,
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 		focused: Boolean,
 	},
-	computed: {
-		localeDate() {
-			return dayjs(this.message.time).format("D MMMM YYYY");
-		},
-	},
-	mounted() {
-		if (this.hoursPassed() < 48) {
-			eventbus.on("daychange", this.dayChange);
-		}
-	},
-	beforeDestroy() {
-		eventbus.off("daychange", this.dayChange);
-	},
-	methods: {
-		hoursPassed() {
-			return (Date.now() - Date.parse(this.message.time)) / 3600000;
-		},
-		dayChange() {
-			this.$forceUpdate();
+	setup(props) {
+		const localeDate = computed(() => dayjs(props.message.time).format("D MMMM YYYY"));
 
-			if (this.hoursPassed() >= 48) {
-				eventbus.off("daychange", this.dayChange);
+		const hoursPassed = () => {
+			return (Date.now() - Date.parse(props.message.time.toString())) / 3600000;
+		};
+
+		const dayChange = () => {
+			if (hoursPassed() >= 48) {
+				eventbus.off("daychange", dayChange);
 			}
-		},
-		friendlyDate() {
+		};
+
+		const friendlyDate = () => {
 			// See http://momentjs.com/docs/#/displaying/calendar-time/
-			return dayjs(this.message.time).calendar(null, {
+			return dayjs(props.message.time).calendar(null, {
 				sameDay: "[Today]",
 				lastDay: "[Yesterday]",
 				lastWeek: "D MMMM YYYY",
 				sameElse: "D MMMM YYYY",
 			});
-		},
+		};
+
+		onMounted(() => {
+			if (hoursPassed() < 48) {
+				eventbus.on("daychange", dayChange);
+			}
+		});
+
+		onBeforeUnmount(() => {
+			eventbus.off("daychange", dayChange);
+		});
+
+		return {
+			localeDate,
+			friendlyDate,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Draggable.vue b/client/components/Draggable.vue
new file mode 100644
index 00000000..065662fd
--- /dev/null
+++ b/client/components/Draggable.vue
@@ -0,0 +1,120 @@
+<template>
+	<div ref="containerRef" :class="$props.class">
+		<slot
+			v-for="(item, index) of list"
+			:key="item[itemKey]"
+			:element="item"
+			:index="index"
+			name="item"
+		></slot>
+	</div>
+</template>
+
+<script lang="ts">
+import {defineComponent, ref, PropType, watch, onUnmounted, onBeforeUnmount} from "vue";
+import Sortable from "sortablejs";
+
+const Props = {
+	delay: {
+		type: Number,
+		default: 0,
+		required: false,
+	},
+	delayOnTouchOnly: {
+		type: Boolean,
+		default: false,
+		required: false,
+	},
+	touchStartThreshold: {
+		type: Number,
+		default: 10,
+		required: false,
+	},
+	handle: {
+		type: String,
+		default: "",
+		required: false,
+	},
+	draggable: {
+		type: String,
+		default: "",
+		required: false,
+	},
+	ghostClass: {
+		type: String,
+		default: "",
+		required: false,
+	},
+	dragClass: {
+		type: String,
+		default: "",
+		required: false,
+	},
+	group: {
+		type: String,
+		default: "",
+		required: false,
+	},
+	class: {
+		type: String,
+		default: "",
+		required: false,
+	},
+	itemKey: {
+		type: String,
+		default: "",
+		required: true,
+	},
+	list: {
+		type: Array as PropType<any[]>,
+		default: [],
+		required: true,
+	},
+	filter: {
+		type: String,
+		default: "",
+		required: false,
+	},
+};
+
+export default defineComponent({
+	name: "Draggable",
+	props: Props,
+	emits: ["change", "choose", "unchoose"],
+	setup(props, {emit}) {
+		const containerRef = ref<HTMLElement | null>(null);
+		const sortable = ref<Sortable | null>(null);
+
+		watch(containerRef, (newDraggable) => {
+			if (newDraggable) {
+				sortable.value = new Sortable(newDraggable, {
+					...props,
+
+					onChoose(event) {
+						emit("choose", event);
+					},
+
+					onUnchoose(event) {
+						emit("unchoose", event);
+					},
+
+					onEnd(event) {
+						emit("change", event);
+					},
+				});
+			}
+		});
+
+		onBeforeUnmount(() => {
+			if (sortable.value) {
+				sortable.value.destroy();
+				containerRef.value = null;
+			}
+		});
+
+		return {
+			containerRef,
+		};
+	},
+});
+</script>
diff --git a/client/components/ImageViewer.vue b/client/components/ImageViewer.vue
index 8ad19773..31b8d750 100644
--- a/client/components/ImageViewer.vue
+++ b/client/components/ImageViewer.vue
@@ -38,121 +38,125 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
 import Mousetrap from "mousetrap";
+import {computed, defineComponent, ref, watch} from "vue";
+import {onBeforeRouteLeave, onBeforeRouteUpdate} from "vue-router";
 import eventbus from "../js/eventbus";
+import {ClientChan, ClientMessage, ClientLinkPreview} from "../js/types";
 
-export default {
+export default defineComponent({
 	name: "ImageViewer",
-	data() {
-		return {
-			link: null,
-			previousImage: null,
-			nextImage: null,
-			channel: null,
+	setup() {
+		const viewer = ref<HTMLDivElement>();
+		const image = ref<HTMLImageElement>();
 
-			position: {
-				x: 0,
-				y: 0,
-			},
-			transform: {
-				x: 0,
-				y: 0,
-				scale: 0,
-			},
-		};
-	},
-	computed: {
-		computeImageStyles() {
+		const link = ref<ClientLinkPreview | null>(null);
+		const previousImage = ref<ClientLinkPreview | null>();
+		const nextImage = ref<ClientLinkPreview | null>();
+		const channel = ref<ClientChan | null>();
+
+		const position = ref<{
+			x: number;
+			y: number;
+		}>({
+			x: 0,
+			y: 0,
+		});
+
+		const transform = ref<{
+			scale: number;
+			x: number;
+			y: number;
+		}>({
+			scale: 1,
+			x: 0,
+			y: 0,
+		});
+
+		const computeImageStyles = computed(() => {
 			// Sub pixels may cause the image to blur in certain browsers
 			// round it down to prevent that
-			const transformX = Math.floor(this.transform.x);
-			const transformY = Math.floor(this.transform.y);
+			const transformX = Math.floor(transform.value.x);
+			const transformY = Math.floor(transform.value.y);
 
 			return {
-				left: `${this.position.x}px`,
-				top: `${this.position.y}px`,
-				transform: `translate3d(${transformX}px, ${transformY}px, 0) scale3d(${this.transform.scale}, ${this.transform.scale}, 1)`,
+				left: `${position.value.x}px`,
+				top: `${position.value.y}px`,
+				transform: `translate3d(${transformX}px, ${transformY}px, 0) scale3d(${transform.value.scale}, ${transform.value.scale}, 1)`,
 			};
-		},
-	},
-	watch: {
-		link(newLink, oldLink) {
-			// TODO: history.pushState
-			if (newLink === null) {
-				eventbus.off("escapekey", this.closeViewer);
-				eventbus.off("resize", this.correctPosition);
-				Mousetrap.unbind("left", this.previous);
-				Mousetrap.unbind("right", this.next);
+		});
+
+		const closeViewer = () => {
+			if (link.value === null) {
 				return;
 			}
 
-			this.setPrevNextImages();
+			channel.value = null;
+			previousImage.value = null;
+			nextImage.value = null;
+			link.value = null;
+		};
 
-			if (!oldLink) {
-				eventbus.on("escapekey", this.closeViewer);
-				eventbus.on("resize", this.correctPosition);
-				Mousetrap.bind("left", this.previous);
-				Mousetrap.bind("right", this.next);
-			}
-		},
-	},
-	methods: {
-		closeViewer() {
-			if (this.link === null) {
-				return;
-			}
-
-			this.channel = null;
-			this.previousImage = null;
-			this.nextImage = null;
-			this.link = null;
-		},
-		setPrevNextImages() {
-			if (!this.channel) {
+		const setPrevNextImages = () => {
+			if (!channel.value || !link.value) {
 				return null;
 			}
 
-			const links = this.channel.messages
+			const links = channel.value.messages
 				.map((msg) => msg.previews)
 				.flat()
 				.filter((preview) => preview.thumb);
 
-			const currentIndex = links.indexOf(this.link);
+			const currentIndex = links.indexOf(link.value);
 
-			this.previousImage = links[currentIndex - 1] || null;
-			this.nextImage = links[currentIndex + 1] || null;
-		},
-		previous() {
-			if (this.previousImage) {
-				this.link = this.previousImage;
-			}
-		},
-		next() {
-			if (this.nextImage) {
-				this.link = this.nextImage;
-			}
-		},
-		onImageLoad() {
-			this.prepareImage();
-		},
-		prepareImage() {
-			const viewer = this.$refs.viewer;
-			const image = this.$refs.image;
-			const width = viewer.offsetWidth;
-			const height = viewer.offsetHeight;
-			const scale = Math.min(1, width / image.width, height / image.height);
+			previousImage.value = links[currentIndex - 1] || null;
+			nextImage.value = links[currentIndex + 1] || null;
+		};
 
-			this.position.x = Math.floor(-image.naturalWidth / 2);
-			this.position.y = Math.floor(-image.naturalHeight / 2);
-			this.transform.scale = Math.max(scale, 0.1);
-			this.transform.x = width / 2;
-			this.transform.y = height / 2;
-		},
-		calculateZoomShift(newScale, x, y, oldScale) {
-			const imageWidth = this.$refs.image.width;
-			const centerX = this.$refs.viewer.offsetWidth / 2;
-			const centerY = this.$refs.viewer.offsetHeight / 2;
+		const previous = () => {
+			if (previousImage.value) {
+				link.value = previousImage.value;
+			}
+		};
+
+		const next = () => {
+			if (nextImage.value) {
+				link.value = nextImage.value;
+			}
+		};
+
+		const prepareImage = () => {
+			const viewerEl = viewer.value;
+			const imageEl = image.value;
+
+			if (!viewerEl || !imageEl) {
+				return;
+			}
+
+			const width = viewerEl.offsetWidth;
+			const height = viewerEl.offsetHeight;
+			const scale = Math.min(1, width / imageEl.width, height / imageEl.height);
+
+			position.value.x = Math.floor(-image.value!.naturalWidth / 2);
+			position.value.y = Math.floor(-image.value!.naturalHeight / 2);
+			transform.value.scale = Math.max(scale, 0.1);
+			transform.value.x = width / 2;
+			transform.value.y = height / 2;
+		};
+
+		const onImageLoad = () => {
+			prepareImage();
+		};
+
+		const calculateZoomShift = (newScale: number, x: number, y: number, oldScale: number) => {
+			if (!image.value || !viewer.value) {
+				return;
+			}
+
+			const imageWidth = image.value.width;
+			const centerX = viewer.value.offsetWidth / 2;
+			const centerY = viewer.value.offsetHeight / 2;
 
 			return {
 				x:
@@ -164,32 +168,40 @@ export default {
 					((centerY - (oldScale - (imageWidth * x) / 2)) / x) * newScale +
 					(imageWidth * newScale) / 2,
 			};
-		},
-		correctPosition() {
-			const image = this.$refs.image;
-			const widthScaled = image.width * this.transform.scale;
-			const heightScaled = image.height * this.transform.scale;
-			const containerWidth = this.$refs.viewer.offsetWidth;
-			const containerHeight = this.$refs.viewer.offsetHeight;
+		};
+
+		const correctPosition = () => {
+			const imageEl = image.value;
+			const viewerEl = viewer.value;
+
+			if (!imageEl || !viewerEl) {
+				return;
+			}
+
+			const widthScaled = imageEl.width * transform.value.scale;
+			const heightScaled = imageEl.height * transform.value.scale;
+			const containerWidth = viewerEl.offsetWidth;
+			const containerHeight = viewerEl.offsetHeight;
 
 			if (widthScaled < containerWidth) {
-				this.transform.x = containerWidth / 2;
-			} else if (this.transform.x - widthScaled / 2 > 0) {
-				this.transform.x = widthScaled / 2;
-			} else if (this.transform.x + widthScaled / 2 < containerWidth) {
-				this.transform.x = containerWidth - widthScaled / 2;
+				transform.value.x = containerWidth / 2;
+			} else if (transform.value.x - widthScaled / 2 > 0) {
+				transform.value.x = widthScaled / 2;
+			} else if (transform.value.x + widthScaled / 2 < containerWidth) {
+				transform.value.x = containerWidth - widthScaled / 2;
 			}
 
 			if (heightScaled < containerHeight) {
-				this.transform.y = containerHeight / 2;
-			} else if (this.transform.y - heightScaled / 2 > 0) {
-				this.transform.y = heightScaled / 2;
-			} else if (this.transform.y + heightScaled / 2 < containerHeight) {
-				this.transform.y = containerHeight - heightScaled / 2;
+				transform.value.y = containerHeight / 2;
+			} else if (transform.value.y - heightScaled / 2 > 0) {
+				transform.value.y = heightScaled / 2;
+			} else if (transform.value.y + heightScaled / 2 < containerHeight) {
+				transform.value.y = containerHeight - heightScaled / 2;
 			}
-		},
+		};
+
 		// Reduce multiple touch points into a single x/y/scale
-		reduceTouches(touches) {
+		const reduceTouches = (touches: TouchList) => {
 			let totalX = 0;
 			let totalY = 0;
 			let totalScale = 0;
@@ -219,17 +231,19 @@ export default {
 				y: totalY / touches.length,
 				scale: totalScale / touches.length,
 			};
-		},
-		onTouchStart(e) {
+		};
+
+		const onTouchStart = (e: TouchEvent) => {
 			// prevent sidebar touchstart event, we don't want to interact with sidebar while in image viewer
 			e.stopImmediatePropagation();
-		},
+		};
+
 		// Touch image manipulation:
 		// 1. Move around by dragging it with one finger
 		// 2. Change image scale by using two fingers
-		onImageTouchStart(e) {
-			const image = this.$refs.image;
-			let touch = this.reduceTouches(e.touches);
+		const onImageTouchStart = (e: TouchEvent) => {
+			const img = image.value;
+			let touch = reduceTouches(e.touches);
 			let currentTouches = e.touches;
 			let touchEndFingers = 0;
 
@@ -240,21 +254,21 @@ export default {
 			};
 
 			const startTransform = {
-				x: this.transform.x,
-				y: this.transform.y,
-				scale: this.transform.scale,
+				x: transform.value.x,
+				y: transform.value.y,
+				scale: transform.value.scale,
 			};
 
 			const touchMove = (moveEvent) => {
-				touch = this.reduceTouches(moveEvent.touches);
+				touch = reduceTouches(moveEvent.touches);
 
 				if (currentTouches.length !== moveEvent.touches.length) {
 					currentTransform.x = touch.x;
 					currentTransform.y = touch.y;
 					currentTransform.scale = touch.scale;
-					startTransform.x = this.transform.x;
-					startTransform.y = this.transform.y;
-					startTransform.scale = this.transform.scale;
+					startTransform.x = transform.value.x;
+					startTransform.y = transform.value.y;
+					startTransform.scale = transform.value.scale;
 				}
 
 				const deltaX = touch.x - currentTransform.x;
@@ -264,20 +278,25 @@ export default {
 				touchEndFingers = 0;
 
 				const newScale = Math.min(3, Math.max(0.1, startTransform.scale * deltaScale));
-				const fixedPosition = this.calculateZoomShift(
+
+				const fixedPosition = calculateZoomShift(
 					newScale,
 					startTransform.scale,
 					startTransform.x,
 					startTransform.y
 				);
 
-				this.transform.x = fixedPosition.x + deltaX;
-				this.transform.y = fixedPosition.y + deltaY;
-				this.transform.scale = newScale;
-				this.correctPosition();
+				if (!fixedPosition) {
+					return;
+				}
+
+				transform.value.x = fixedPosition.x + deltaX;
+				transform.value.y = fixedPosition.y + deltaY;
+				transform.value.scale = newScale;
+				correctPosition();
 			};
 
-			const touchEnd = (endEvent) => {
+			const touchEnd = (endEvent: TouchEvent) => {
 				const changedTouches = endEvent.changedTouches.length;
 
 				if (currentTouches.length > changedTouches + touchEndFingers) {
@@ -287,27 +306,30 @@ export default {
 
 				// todo: this is swipe to close, but it's not working very well due to unfinished delta calculation
 				/* if (
-					this.transform.scale <= 1 &&
+					transform.value.scale <= 1 &&
 					endEvent.changedTouches[0].clientY - startTransform.y <= -70
 				) {
 					return this.closeViewer();
 				}*/
 
-				this.correctPosition();
+				correctPosition();
 
-				image.removeEventListener("touchmove", touchMove, {passive: true});
-				image.removeEventListener("touchend", touchEnd, {passive: true});
+				img?.removeEventListener("touchmove", touchMove);
+				img?.removeEventListener("touchend", touchEnd);
 			};
 
-			image.addEventListener("touchmove", touchMove, {passive: true});
-			image.addEventListener("touchend", touchEnd, {passive: true});
-		},
+			img?.addEventListener("touchmove", touchMove, {passive: true});
+			img?.addEventListener("touchend", touchEnd, {passive: true});
+		};
+
 		// Image mouse manipulation:
 		// 1. Mouse wheel scrolling will zoom in and out
 		// 2. If image is zoomed in, simply dragging it will move it around
-		onImageMouseDown(e) {
+		const onImageMouseDown = (e: MouseEvent) => {
 			// todo: ignore if in touch event currently?
+
 			// only left mouse
+			// TODO: e.buttons?
 			if (e.which !== 1) {
 				return;
 			}
@@ -315,22 +337,26 @@ export default {
 			e.stopPropagation();
 			e.preventDefault();
 
-			const viewer = this.$refs.viewer;
-			const image = this.$refs.image;
+			const viewerEl = viewer.value;
+			const imageEl = image.value;
+
+			if (!viewerEl || !imageEl) {
+				return;
+			}
 
 			const startX = e.clientX;
 			const startY = e.clientY;
-			const startTransformX = this.transform.x;
-			const startTransformY = this.transform.y;
-			const widthScaled = image.width * this.transform.scale;
-			const heightScaled = image.height * this.transform.scale;
-			const containerWidth = viewer.offsetWidth;
-			const containerHeight = viewer.offsetHeight;
-			const centerX = this.transform.x - widthScaled / 2;
-			const centerY = this.transform.y - heightScaled / 2;
+			const startTransformX = transform.value.x;
+			const startTransformY = transform.value.y;
+			const widthScaled = imageEl.width * transform.value.scale;
+			const heightScaled = imageEl.height * transform.value.scale;
+			const containerWidth = viewerEl.offsetWidth;
+			const containerHeight = viewerEl.offsetHeight;
+			const centerX = transform.value.x - widthScaled / 2;
+			const centerY = transform.value.y - heightScaled / 2;
 			let movedDistance = 0;
 
-			const mouseMove = (moveEvent) => {
+			const mouseMove = (moveEvent: MouseEvent) => {
 				moveEvent.stopPropagation();
 				moveEvent.preventDefault();
 
@@ -340,66 +366,112 @@ export default {
 				movedDistance = Math.max(movedDistance, Math.abs(newX), Math.abs(newY));
 
 				if (centerX < 0 || widthScaled + centerX > containerWidth) {
-					this.transform.x = startTransformX + newX;
+					transform.value.x = startTransformX + newX;
 				}
 
 				if (centerY < 0 || heightScaled + centerY > containerHeight) {
-					this.transform.y = startTransformY + newY;
+					transform.value.y = startTransformY + newY;
 				}
 
-				this.correctPosition();
+				correctPosition();
 			};
 
-			const mouseUp = (upEvent) => {
-				this.correctPosition();
+			const mouseUp = (upEvent: MouseEvent) => {
+				correctPosition();
 
 				if (movedDistance < 2 && upEvent.button === 0) {
-					this.closeViewer();
+					closeViewer();
 				}
 
-				image.removeEventListener("mousemove", mouseMove);
-				image.removeEventListener("mouseup", mouseUp);
+				image.value?.removeEventListener("mousemove", mouseMove);
+				image.value?.removeEventListener("mouseup", mouseUp);
 			};
 
-			image.addEventListener("mousemove", mouseMove);
-			image.addEventListener("mouseup", mouseUp);
-		},
+			image.value?.addEventListener("mousemove", mouseMove);
+			image.value?.addEventListener("mouseup", mouseUp);
+		};
+
 		// If image is zoomed in, holding ctrl while scrolling will move the image up and down
-		onMouseWheel(e) {
+		const onMouseWheel = (e: WheelEvent) => {
 			// if image viewer is closing (css animation), you can still trigger mousewheel
 			// TODO: Figure out a better fix for this
-			if (this.link === null) {
+			if (link.value === null) {
 				return;
 			}
 
 			e.preventDefault(); // TODO: Can this be passive?
 
 			if (e.ctrlKey) {
-				this.transform.y += e.deltaY;
+				transform.value.y += e.deltaY;
 			} else {
 				const delta = e.deltaY > 0 ? 0.1 : -0.1;
-				const newScale = Math.min(3, Math.max(0.1, this.transform.scale + delta));
-				const fixedPosition = this.calculateZoomShift(
+				const newScale = Math.min(3, Math.max(0.1, transform.value.scale + delta));
+				const fixedPosition = calculateZoomShift(
 					newScale,
-					this.transform.scale,
-					this.transform.x,
-					this.transform.y
+					transform.value.scale,
+					transform.value.x,
+					transform.value.y
 				);
-				this.transform.scale = newScale;
-				this.transform.x = fixedPosition.x;
-				this.transform.y = fixedPosition.y;
+
+				if (!fixedPosition) {
+					return;
+				}
+
+				transform.value.scale = newScale;
+				transform.value.x = fixedPosition.x;
+				transform.value.y = fixedPosition.y;
 			}
 
-			this.correctPosition();
-		},
-		onClick(e) {
+			correctPosition();
+		};
+
+		const onClick = (e: Event) => {
 			// If click triggers on the image, ignore it
-			if (e.target === this.$refs.image) {
+			if (e.target === image.value) {
 				return;
 			}
 
-			this.closeViewer();
-		},
+			closeViewer();
+		};
+
+		watch(link, (newLink, oldLink) => {
+			// TODO: history.pushState
+			if (newLink === null) {
+				eventbus.off("escapekey", closeViewer);
+				eventbus.off("resize", correctPosition);
+				Mousetrap.unbind("left");
+				Mousetrap.unbind("right");
+				return;
+			}
+
+			setPrevNextImages();
+
+			if (!oldLink) {
+				eventbus.on("escapekey", closeViewer);
+				eventbus.on("resize", correctPosition);
+				Mousetrap.bind("left", previous);
+				Mousetrap.bind("right", next);
+			}
+		});
+
+		return {
+			link,
+			image,
+			transform,
+			closeViewer,
+			next,
+			previous,
+			onImageLoad,
+			onImageMouseDown,
+			onMouseWheel,
+			onClick,
+			onTouchStart,
+			previousImage,
+			nextImage,
+			onImageTouchStart,
+			computeImageStyles,
+			viewer,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/InlineChannel.vue b/client/components/InlineChannel.vue
index 5262561d..784a93ad 100644
--- a/client/components/InlineChannel.vue
+++ b/client/components/InlineChannel.vue
@@ -10,21 +10,26 @@
 	></span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent} from "vue";
 import eventbus from "../js/eventbus";
 
-export default {
+export default defineComponent({
 	name: "InlineChannel",
 	props: {
 		channel: String,
 	},
-	methods: {
-		openContextMenu(event) {
+	setup(props) {
+		const openContextMenu = (event) => {
 			eventbus.emit("contextmenu:inline-channel", {
 				event: event,
-				channel: this.channel,
+				channel: props.channel,
 			});
-		},
+		};
+
+		return {
+			openContextMenu,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/JoinChannel.vue b/client/components/JoinChannel.vue
index 129d5383..fa5eebc4 100644
--- a/client/components/JoinChannel.vue
+++ b/client/components/JoinChannel.vue
@@ -35,54 +35,59 @@
 	</form>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType, ref} from "vue";
+import {switchToChannel} from "../js/router";
 import socket from "../js/socket";
+import {useStore} from "../js/store";
+import {ClientNetwork, ClientChan} from "../js/types";
 
-export default {
+export default defineComponent({
 	name: "JoinChannel",
 	directives: {
 		focus: {
-			inserted(el) {
-				el.focus();
-			},
+			mounted: (el: HTMLFormElement) => el.focus(),
 		},
 	},
 	props: {
-		network: Object,
-		channel: Object,
+		network: {type: Object as PropType<ClientNetwork>, required: true},
+		channel: {type: Object as PropType<ClientChan>, required: true},
 	},
-	data() {
-		return {
-			inputChannel: "",
-			inputPassword: "",
-		};
-	},
-	methods: {
-		onSubmit() {
-			const existingChannel = this.$store.getters.findChannelOnCurrentNetwork(
-				this.inputChannel
-			);
+	emits: ["toggle-join-channel"],
+	setup(props, {emit}) {
+		const store = useStore();
+		const inputChannel = ref("");
+		const inputPassword = ref("");
+
+		const onSubmit = () => {
+			const existingChannel = store.getters.findChannelOnCurrentNetwork(inputChannel.value);
 
 			if (existingChannel) {
-				this.$root.switchToChannel(existingChannel);
+				switchToChannel(existingChannel);
 			} else {
-				const chanTypes = this.network.serverOptions.CHANTYPES;
-				let channel = this.inputChannel;
+				const chanTypes = props.network.serverOptions.CHANTYPES;
+				let channel = inputChannel.value;
 
 				if (chanTypes && chanTypes.length > 0 && !chanTypes.includes(channel[0])) {
 					channel = chanTypes[0] + channel;
 				}
 
 				socket.emit("input", {
-					text: `/join ${channel} ${this.inputPassword}`,
-					target: this.channel.id,
+					text: `/join ${channel} ${inputPassword.value}`,
+					target: props.channel.id,
 				});
 			}
 
-			this.inputChannel = "";
-			this.inputPassword = "";
-			this.$emit("toggle-join-channel");
-		},
+			inputChannel.value = "";
+			inputPassword.value = "";
+			emit("toggle-join-channel");
+		};
+
+		return {
+			inputChannel,
+			inputPassword,
+			onSubmit,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/LinkPreview.vue b/client/components/LinkPreview.vue
index 9ae10b74..9a124ab8 100644
--- a/client/components/LinkPreview.vue
+++ b/client/components/LinkPreview.vue
@@ -129,137 +129,201 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
+import {
+	computed,
+	defineComponent,
+	inject,
+	nextTick,
+	onBeforeUnmount,
+	onMounted,
+	onUnmounted,
+	PropType,
+	ref,
+	watch,
+} from "vue";
+import {onBeforeRouteUpdate} from "vue-router";
 import eventbus from "../js/eventbus";
 import friendlysize from "../js/helpers/friendlysize";
+import {useStore} from "../js/store";
+import type {ClientChan, ClientLinkPreview} from "../js/types";
+import {imageViewerKey} from "./App.vue";
 
-export default {
+export default defineComponent({
 	name: "LinkPreview",
 	props: {
-		link: Object,
-		keepScrollPosition: Function,
-		channel: Object,
-	},
-	data() {
-		return {
-			showMoreButton: false,
-			isContentShown: false,
-		};
-	},
-	computed: {
-		moreButtonLabel() {
-			return this.isContentShown ? "Less" : "More";
+		link: {
+			type: Object as PropType<ClientLinkPreview>,
+			required: true,
 		},
-		imageMaxSize() {
-			if (!this.link.maxSize) {
+		keepScrollPosition: {
+			type: Function as PropType<() => void>,
+			required: true,
+		},
+		channel: {type: Object as PropType<ClientChan>, required: true},
+	},
+	setup(props) {
+		const store = useStore();
+
+		const showMoreButton = ref(false);
+		const isContentShown = ref(false);
+		const imageViewer = inject(imageViewerKey);
+
+		onBeforeRouteUpdate((to, from, next) => {
+			// cancel the navigation if the user is trying to close the image viewer
+			if (imageViewer?.value?.link) {
+				imageViewer.value.closeViewer();
+				return next(false);
+			}
+
+			next();
+		});
+
+		const content = ref<HTMLDivElement | null>(null);
+		const container = ref<HTMLDivElement | null>(null);
+
+		const moreButtonLabel = computed(() => {
+			return isContentShown.value ? "Less" : "More";
+		});
+
+		const imageMaxSize = computed(() => {
+			if (!props.link.maxSize) {
 				return;
 			}
 
-			return friendlysize(this.link.maxSize);
-		},
-	},
-	watch: {
-		"link.type"() {
-			this.updateShownState();
-			this.onPreviewUpdate();
-		},
-	},
-	created() {
-		this.updateShownState();
-	},
-	mounted() {
-		eventbus.on("resize", this.handleResize);
+			return friendlysize(props.link.maxSize);
+		});
 
-		this.onPreviewUpdate();
-	},
-	beforeDestroy() {
-		eventbus.off("resize", this.handleResize);
-	},
-	destroyed() {
-		// Let this preview go through load/canplay events again,
-		// Otherwise the browser can cause a resize on video elements
-		this.link.sourceLoaded = false;
-	},
-	methods: {
-		onPreviewUpdate() {
+		const handleResize = () => {
+			nextTick(() => {
+				if (!content.value || !container.value) {
+					return;
+				}
+
+				showMoreButton.value = content.value.offsetWidth >= container.value.offsetWidth;
+			}).catch((e) => {
+				// eslint-disable-next-line no-console
+				console.error("Error in LinkPreview.handleResize", e);
+			});
+		};
+
+		const onPreviewReady = () => {
+			props.link.sourceLoaded = true;
+
+			props.keepScrollPosition();
+
+			if (props.link.type === "link") {
+				handleResize();
+			}
+		};
+
+		const onPreviewUpdate = () => {
 			// Don't display previews while they are loading on the server
-			if (this.link.type === "loading") {
+			if (props.link.type === "loading") {
 				return;
 			}
 
 			// Error does not have any media to render
-			if (this.link.type === "error") {
-				this.onPreviewReady();
+			if (props.link.type === "error") {
+				onPreviewReady();
 			}
 
 			// If link doesn't have a thumbnail, render it
-			if (this.link.type === "link") {
-				this.handleResize();
-				this.keepScrollPosition();
+			if (props.link.type === "link") {
+				handleResize();
+				props.keepScrollPosition();
 			}
-		},
-		onPreviewReady() {
-			this.$set(this.link, "sourceLoaded", true);
+		};
 
-			this.keepScrollPosition();
-
-			if (this.link.type === "link") {
-				this.handleResize();
-			}
-		},
-		onThumbnailError() {
+		const onThumbnailError = () => {
 			// If thumbnail fails to load, hide it and show the preview without it
-			this.link.thumb = "";
-			this.onPreviewReady();
-		},
-		onThumbnailClick(e) {
+			props.link.thumb = "";
+			onPreviewReady();
+		};
+
+		const onThumbnailClick = (e: MouseEvent) => {
 			e.preventDefault();
 
-			const imageViewer = this.$root.$refs.app.$refs.imageViewer;
-			imageViewer.channel = this.channel;
-			imageViewer.link = this.link;
-		},
-		onMoreClick() {
-			this.isContentShown = !this.isContentShown;
-			this.keepScrollPosition();
-		},
-		handleResize() {
-			this.$nextTick(() => {
-				if (!this.$refs.content) {
-					return;
-				}
+			if (!imageViewer?.value) {
+				return;
+			}
 
-				this.showMoreButton =
-					this.$refs.content.offsetWidth >= this.$refs.container.offsetWidth;
-			});
-		},
-		updateShownState() {
+			imageViewer.value.channel = props.channel;
+			imageViewer.value.link = props.link;
+		};
+
+		const onMoreClick = () => {
+			isContentShown.value = !isContentShown.value;
+			props.keepScrollPosition();
+		};
+
+		const updateShownState = () => {
 			// User has manually toggled the preview, do not apply default
-			if (this.link.shown !== null) {
+			if (props.link.shown !== null) {
 				return;
 			}
 
 			let defaultState = false;
 
-			switch (this.link.type) {
+			switch (props.link.type) {
 				case "error":
 					// Collapse all errors by default unless its a message about image being too big
-					if (this.link.error === "image-too-big") {
-						defaultState = this.$store.state.settings.media;
+					if (props.link.error === "image-too-big") {
+						defaultState = store.state.settings.media;
 					}
 
 					break;
 
 				case "link":
-					defaultState = this.$store.state.settings.links;
+					defaultState = store.state.settings.links;
 					break;
 
 				default:
-					defaultState = this.$store.state.settings.media;
+					defaultState = store.state.settings.media;
 			}
 
-			this.link.shown = defaultState;
-		},
+			props.link.shown = defaultState;
+		};
+
+		updateShownState();
+
+		watch(
+			() => props.link.type,
+			() => {
+				updateShownState();
+				onPreviewUpdate();
+			}
+		);
+
+		onMounted(() => {
+			eventbus.on("resize", handleResize);
+
+			onPreviewUpdate();
+		});
+
+		onBeforeUnmount(() => {
+			eventbus.off("resize", handleResize);
+		});
+
+		onUnmounted(() => {
+			// Let this preview go through load/canplay events again,
+			// Otherwise the browser can cause a resize on video elements
+			props.link.sourceLoaded = false;
+		});
+
+		return {
+			moreButtonLabel,
+			imageMaxSize,
+			onThumbnailClick,
+			onThumbnailError,
+			onMoreClick,
+			onPreviewReady,
+			onPreviewUpdate,
+			showMoreButton,
+			isContentShown,
+			content,
+			container,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/LinkPreviewFileSize.vue b/client/components/LinkPreviewFileSize.vue
index 883df53d..5c577c1b 100644
--- a/client/components/LinkPreviewFileSize.vue
+++ b/client/components/LinkPreviewFileSize.vue
@@ -2,18 +2,21 @@
 	<span class="preview-size">({{ previewSize }})</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent} from "vue";
 import friendlysize from "../js/helpers/friendlysize";
 
-export default {
+export default defineComponent({
 	name: "LinkPreviewFileSize",
 	props: {
-		size: Number,
+		size: {type: Number, required: true},
 	},
-	computed: {
-		previewSize() {
-			return friendlysize(this.size);
-		},
+	setup(props) {
+		const previewSize = friendlysize(props.size);
+
+		return {
+			previewSize,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/LinkPreviewToggle.vue b/client/components/LinkPreviewToggle.vue
index 2b461066..24351ab7 100644
--- a/client/components/LinkPreviewToggle.vue
+++ b/client/components/LinkPreviewToggle.vue
@@ -7,23 +7,31 @@
 	/>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import {computed, defineComponent, PropType} from "vue";
+import {ClientMessage, ClientLinkPreview} from "../js/types";
+
+export default defineComponent({
 	name: "LinkPreviewToggle",
 	props: {
-		link: Object,
+		link: {type: Object as PropType<ClientLinkPreview>, required: true},
+		message: {type: Object as PropType<ClientMessage>, required: true},
 	},
-	computed: {
-		ariaLabel() {
-			return this.link.shown ? "Collapse preview" : "Expand preview";
-		},
-	},
-	methods: {
-		onClick() {
-			this.link.shown = !this.link.shown;
+	emits: ["toggle-link-preview"],
+	setup(props, {emit}) {
+		const ariaLabel = computed(() => {
+			return props.link.shown ? "Collapse preview" : "Expand preview";
+		});
 
-			this.$parent.$emit("toggle-link-preview", this.link, this.$parent.message);
-		},
+		const onClick = () => {
+			props.link.shown = !props.link.shown;
+			emit("toggle-link-preview", props.link, props.message);
+		};
+
+		return {
+			ariaLabel,
+			onClick,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Mentions.vue b/client/components/Mentions.vue
index 54759bff..63144948 100644
--- a/client/components/Mentions.vue
+++ b/client/components/Mentions.vue
@@ -20,20 +20,20 @@
 				<p v-if="isLoading">Loading…</p>
 				<p v-else>You have no recent mentions.</p>
 			</template>
-			<template v-for="message in resolvedMessages" v-else>
-				<div :key="message.msgId" :class="['msg', message.type]">
+			<template v-for="message in resolvedMessages" v-else :key="message.msgId">
+				<div :class="['msg', message.type]">
 					<div class="mentions-info">
 						<div>
 							<span class="from">
-								<Username :user="message.from" />
+								<Username :user="(message.from as any)" />
 								<template v-if="message.channel">
 									in {{ message.channel.channel.name }} on
 									{{ message.channel.network.name }}
 								</template>
-								<template v-else> in unknown channel </template>
-							</span>
+								<template v-else> in unknown channel </template> </span
+							>{{ ` ` }}
 							<span :title="message.localetime" class="time">
-								{{ messageTime(message.time) }}
+								{{ messageTime(message.time.toString()) }}
 							</span>
 						</div>
 						<div>
@@ -50,7 +50,7 @@
 						</div>
 					</div>
 					<div class="content" dir="auto">
-						<ParsedMessage :network="null" :message="message" />
+						<ParsedMessage :message="(message as any)" />
 					</div>
 				</div>
 			</template>
@@ -144,7 +144,7 @@
 }
 </style>
 
-<script>
+<script lang="ts">
 import Username from "./Username.vue";
 import ParsedMessage from "./ParsedMessage.vue";
 import socket from "../js/socket";
@@ -152,78 +152,96 @@ import eventbus from "../js/eventbus";
 import localetime from "../js/helpers/localetime";
 import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
+import {computed, watch, defineComponent, ref, onMounted, onUnmounted} from "vue";
+import {useStore} from "../js/store";
+import {ClientMention} from "../js/types";
 
 dayjs.extend(relativeTime);
 
-export default {
+export default defineComponent({
 	name: "Mentions",
 	components: {
 		Username,
 		ParsedMessage,
 	},
-	data() {
-		return {
-			isOpen: false,
-			isLoading: false,
-		};
-	},
-	computed: {
-		resolvedMessages() {
-			const messages = this.$store.state.mentions.slice().reverse();
+	setup() {
+		const store = useStore();
+		const isOpen = ref(false);
+		const isLoading = ref(false);
+		const resolvedMessages = computed(() => {
+			const messages = store.state.mentions.slice().reverse();
 
 			for (const message of messages) {
 				message.localetime = localetime(message.time);
-				message.channel = this.$store.getters.findChannel(message.chanId);
+				message.channel = store.getters.findChannel(message.chanId);
 			}
 
-			return messages.filter((message) => !message.channel.channel.muted);
-		},
-	},
-	watch: {
-		"$store.state.mentions"() {
-			this.isLoading = false;
-		},
-	},
-	mounted() {
-		eventbus.on("mentions:toggle", this.togglePopup);
-		eventbus.on("escapekey", this.closePopup);
-	},
-	destroyed() {
-		eventbus.off("mentions:toggle", this.togglePopup);
-		eventbus.off("escapekey", this.closePopup);
-	},
-	methods: {
-		messageTime(time) {
+			return messages.filter((message) => !message.channel?.channel.muted);
+		});
+
+		watch(
+			() => store.state.mentions,
+			() => {
+				isLoading.value = false;
+			}
+		);
+
+		const messageTime = (time: string) => {
 			return dayjs(time).fromNow();
-		},
-		dismissMention(message) {
-			this.$store.state.mentions.splice(
-				this.$store.state.mentions.findIndex((m) => m.msgId === message.msgId),
+		};
+
+		const dismissMention = (message: ClientMention) => {
+			store.state.mentions.splice(
+				store.state.mentions.findIndex((m) => m.msgId === message.msgId),
 				1
 			);
 
 			socket.emit("mentions:dismiss", message.msgId);
-		},
-		dismissAllMentions() {
-			this.$store.state.mentions = [];
-			socket.emit("mentions:dismiss_all");
-		},
-		containerClick(event) {
-			if (event.currentTarget === event.target) {
-				this.isOpen = false;
-			}
-		},
-		togglePopup() {
-			this.isOpen = !this.isOpen;
+		};
 
-			if (this.isOpen) {
-				this.isLoading = true;
+		const dismissAllMentions = () => {
+			store.state.mentions = [];
+			socket.emit("mentions:dismiss_all");
+		};
+
+		const containerClick = (event: Event) => {
+			if (event.currentTarget === event.target) {
+				isOpen.value = false;
+			}
+		};
+
+		const togglePopup = () => {
+			isOpen.value = !isOpen.value;
+
+			if (isOpen.value) {
+				isLoading.value = true;
 				socket.emit("mentions:get");
 			}
-		},
-		closePopup() {
-			this.isOpen = false;
-		},
+		};
+
+		const closePopup = () => {
+			isOpen.value = false;
+		};
+
+		onMounted(() => {
+			eventbus.on("mentions:toggle", togglePopup);
+			eventbus.on("escapekey", closePopup);
+		});
+
+		onUnmounted(() => {
+			eventbus.off("mentions:toggle", togglePopup);
+			eventbus.off("escapekey", closePopup);
+		});
+
+		return {
+			isOpen,
+			isLoading,
+			resolvedMessages,
+			messageTime,
+			dismissMention,
+			dismissAllMentions,
+			containerClick,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Message.vue b/client/components/Message.vue
index 5526badd..65167784 100644
--- a/client/components/Message.vue
+++ b/client/components/Message.vue
@@ -17,12 +17,14 @@
 			aria-hidden="true"
 			:aria-label="messageTimeLocale"
 			class="time tooltipped tooltipped-e"
-			>{{ messageTime }}
+			>{{ `${messageTime}&#32;` }}
 		</span>
 		<template v-if="message.type === 'unhandled'">
 			<span class="from">[{{ message.command }}]</span>
 			<span class="content">
-				<span v-for="(param, id) in message.params" :key="id">{{ param }} </span>
+				<span v-for="(param, id) in message.params" :key="id">{{
+					`&#32;${param}&#32;`
+				}}</span>
 			</span>
 		</template>
 		<template v-else-if="isAction()">
@@ -95,56 +97,73 @@
 	</div>
 </template>
 
-<script>
-const constants = require("../js/constants");
-import localetime from "../js/helpers/localetime";
+<script lang="ts">
+import {computed, defineComponent, PropType} from "vue";
 import dayjs from "dayjs";
+
+import constants from "../js/constants";
+import localetime from "../js/helpers/localetime";
 import Username from "./Username.vue";
 import LinkPreview from "./LinkPreview.vue";
 import ParsedMessage from "./ParsedMessage.vue";
 import MessageTypes from "./MessageTypes";
 
+import type {ClientChan, ClientMessage, ClientNetwork} from "../js/types";
+import {useStore} from "../js/store";
+
 MessageTypes.ParsedMessage = ParsedMessage;
 MessageTypes.LinkPreview = LinkPreview;
 MessageTypes.Username = Username;
 
-export default {
+export default defineComponent({
 	name: "Message",
 	components: MessageTypes,
 	props: {
-		message: Object,
-		channel: Object,
-		network: Object,
-		keepScrollPosition: Function,
+		message: {type: Object as PropType<ClientMessage>, required: true},
+		channel: {type: Object as PropType<ClientChan>, required: false},
+		network: {type: Object as PropType<ClientNetwork>, required: true},
+		keepScrollPosition: Function as PropType<() => void>,
 		isPreviousSource: Boolean,
 		focused: Boolean,
 	},
-	computed: {
-		timeFormat() {
-			let format;
+	setup(props) {
+		const store = useStore();
 
-			if (this.$store.state.settings.use12hClock) {
-				format = this.$store.state.settings.showSeconds ? "msg12hWithSeconds" : "msg12h";
+		const timeFormat = computed(() => {
+			let format: keyof typeof constants.timeFormats;
+
+			if (store.state.settings.use12hClock) {
+				format = store.state.settings.showSeconds ? "msg12hWithSeconds" : "msg12h";
 			} else {
-				format = this.$store.state.settings.showSeconds ? "msgWithSeconds" : "msgDefault";
+				format = store.state.settings.showSeconds ? "msgWithSeconds" : "msgDefault";
 			}
 
 			return constants.timeFormats[format];
-		},
-		messageTime() {
-			return dayjs(this.message.time).format(this.timeFormat);
-		},
-		messageTimeLocale() {
-			return localetime(this.message.time);
-		},
-		messageComponent() {
-			return "message-" + this.message.type;
-		},
+		});
+
+		const messageTime = computed(() => {
+			return dayjs(props.message.time).format(timeFormat.value);
+		});
+
+		const messageTimeLocale = computed(() => {
+			return localetime(props.message.time);
+		});
+
+		const messageComponent = computed(() => {
+			return "message-" + props.message.type;
+		});
+
+		const isAction = () => {
+			return typeof MessageTypes["message-" + props.message.type] !== "undefined";
+		};
+
+		return {
+			timeFormat,
+			messageTime,
+			messageTimeLocale,
+			messageComponent,
+			isAction,
+		};
 	},
-	methods: {
-		isAction() {
-			return typeof MessageTypes["message-" + this.message.type] !== "undefined";
-		},
-	},
-};
+});
 </script>
diff --git a/client/components/MessageCondensed.vue b/client/components/MessageCondensed.vue
index d167a86d..6cf92b67 100644
--- a/client/components/MessageCondensed.vue
+++ b/client/components/MessageCondensed.vue
@@ -17,35 +17,45 @@
 	</div>
 </template>
 
-<script>
-const constants = require("../js/constants");
+<script lang="ts">
+import {computed, defineComponent, PropType, ref} from "vue";
+import constants from "../js/constants";
+import {ClientMessage, ClientNetwork} from "../js/types";
 import Message from "./Message.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageCondensed",
 	components: {
 		Message,
 	},
 	props: {
-		network: Object,
-		messages: Array,
-		keepScrollPosition: Function,
+		network: {type: Object as PropType<ClientNetwork>, required: true},
+		messages: {
+			type: Array as PropType<ClientMessage[]>,
+			required: true,
+		},
+		keepScrollPosition: {
+			type: Function as PropType<() => void>,
+			required: true,
+		},
 		focused: Boolean,
 	},
-	data() {
-		return {
-			isCollapsed: true,
+	setup(props) {
+		const isCollapsed = ref(true);
+
+		const onCollapseClick = () => {
+			isCollapsed.value = !isCollapsed.value;
+			props.keepScrollPosition();
 		};
-	},
-	computed: {
-		condensedText() {
-			const obj = {};
+
+		const condensedText = computed(() => {
+			const obj: Record<string, number> = {};
 
 			constants.condensedTypes.forEach((type) => {
 				obj[type] = 0;
 			});
 
-			for (const message of this.messages) {
+			for (const message of props.messages) {
 				// special case since one MODE message can change multiple modes
 				if (message.type === "mode") {
 					// syntax: +vv-t maybe-some targets
@@ -64,13 +74,13 @@ export default {
 			// Count quits as parts in condensed messages to reduce information density
 			obj.part += obj.quit;
 
-			const strings = [];
+			const strings: string[] = [];
 			constants.condensedTypes.forEach((type) => {
 				if (obj[type]) {
 					switch (type) {
 						case "chghost":
 							strings.push(
-								obj[type] +
+								String(obj[type]) +
 									(obj[type] > 1
 										? " users have changed hostname"
 										: " user has changed hostname")
@@ -78,18 +88,19 @@ export default {
 							break;
 						case "join":
 							strings.push(
-								obj[type] +
+								String(obj[type]) +
 									(obj[type] > 1 ? " users have joined" : " user has joined")
 							);
 							break;
 						case "part":
 							strings.push(
-								obj[type] + (obj[type] > 1 ? " users have left" : " user has left")
+								String(obj[type]) +
+									(obj[type] > 1 ? " users have left" : " user has left")
 							);
 							break;
 						case "nick":
 							strings.push(
-								obj[type] +
+								String(obj[type]) +
 									(obj[type] > 1
 										? " users have changed nick"
 										: " user has changed nick")
@@ -97,33 +108,38 @@ export default {
 							break;
 						case "kick":
 							strings.push(
-								obj[type] +
+								String(obj[type]) +
 									(obj[type] > 1 ? " users were kicked" : " user was kicked")
 							);
 							break;
 						case "mode":
 							strings.push(
-								obj[type] + (obj[type] > 1 ? " modes were set" : " mode was set")
+								String(obj[type]) +
+									(obj[type] > 1 ? " modes were set" : " mode was set")
 							);
 							break;
 					}
 				}
 			});
 
-			let text = strings.pop();
-
 			if (strings.length) {
-				text = strings.join(", ") + ", and " + text;
+				let text = strings.pop();
+
+				if (strings.length) {
+					text = strings.join(", ") + ", and " + text!;
+				}
+
+				return text;
 			}
 
-			return text;
-		},
+			return "";
+		});
+
+		return {
+			isCollapsed,
+			condensedText,
+			onCollapseClick,
+		};
 	},
-	methods: {
-		onCollapseClick() {
-			this.isCollapsed = !this.isCollapsed;
-			this.keepScrollPosition();
-		},
-	},
-};
+});
 </script>
diff --git a/client/components/MessageList.vue b/client/components/MessageList.vue
index cd298a6c..1c5ce9b5 100644
--- a/client/components/MessageList.vue
+++ b/client/components/MessageList.vue
@@ -3,7 +3,7 @@
 		<div v-show="channel.moreHistoryAvailable" class="show-more">
 			<button
 				ref="loadMoreButton"
-				:disabled="channel.historyLoading || !$store.state.isConnected"
+				:disabled="channel.historyLoading || !store.state.isConnected"
 				class="btn"
 				@click="onShowMoreClick"
 			>
@@ -22,11 +22,11 @@
 				<DateMarker
 					v-if="shouldDisplayDateMarker(message, id)"
 					:key="message.id + '-date'"
-					:message="message"
-					:focused="message.id == focused"
+					:message="message as any"
+					:focused="message.id === focused"
 				/>
 				<div
-					v-if="shouldDisplayUnreadMarker(message.id)"
+					v-if="shouldDisplayUnreadMarker(Number(message.id))"
 					:key="message.id + '-unread'"
 					class="unread-marker"
 				>
@@ -39,7 +39,7 @@
 					:network="network"
 					:keep-scroll-position="keepScrollPosition"
 					:messages="message.messages"
-					:focused="message.id == focused"
+					:focused="message.id === focused"
 				/>
 				<Message
 					v-else
@@ -49,7 +49,7 @@
 					:message="message"
 					:keep-scroll-position="keepScrollPosition"
 					:is-previous-source="isPreviousSource(message, id)"
-					:focused="message.id == focused"
+					:focused="message.id === focused"
 					@toggle-link-preview="onLinkPreviewToggle"
 				/>
 			</template>
@@ -57,18 +57,41 @@
 	</div>
 </template>
 
-<script>
-const constants = require("../js/constants");
+<script lang="ts">
+import constants from "../js/constants";
 import eventbus from "../js/eventbus";
 import clipboard from "../js/clipboard";
 import socket from "../js/socket";
 import Message from "./Message.vue";
 import MessageCondensed from "./MessageCondensed.vue";
 import DateMarker from "./DateMarker.vue";
+import {
+	computed,
+	defineComponent,
+	nextTick,
+	onBeforeUnmount,
+	onBeforeUpdate,
+	onMounted,
+	onUnmounted,
+	PropType,
+	ref,
+	watch,
+} from "vue";
+import {useStore} from "../js/store";
+import {ClientChan, ClientMessage, ClientNetwork, ClientLinkPreview} from "../js/types";
+import Msg from "../../server/models/msg";
 
+type CondensedMessageContainer = {
+	type: "condensed";
+	time: Date;
+	messages: ClientMessage[];
+	id?: number;
+};
+
+// TODO; move into component
 let unreadMarkerShown = false;
 
-export default {
+export default defineComponent({
 	name: "MessageList",
 	components: {
 		Message,
@@ -76,32 +99,105 @@ export default {
 		DateMarker,
 	},
 	props: {
-		network: Object,
-		channel: Object,
-		focused: String,
+		network: {type: Object as PropType<ClientNetwork>, required: true},
+		channel: {type: Object as PropType<ClientChan>, required: true},
+		focused: Number,
 	},
-	computed: {
-		condensedMessages() {
-			if (this.channel.type !== "channel") {
-				return this.channel.messages;
+	setup(props, {emit}) {
+		const store = useStore();
+
+		const chat = ref<HTMLDivElement | null>(null);
+		const loadMoreButton = ref<HTMLButtonElement | null>(null);
+		const historyObserver = ref<IntersectionObserver | null>(null);
+		const skipNextScrollEvent = ref(false);
+
+		const isWaitingForNextTick = ref(false);
+
+		const jumpToBottom = () => {
+			skipNextScrollEvent.value = true;
+			props.channel.scrolledToBottom = true;
+
+			const el = chat.value;
+
+			if (el) {
+				el.scrollTop = el.scrollHeight;
+			}
+		};
+
+		const onShowMoreClick = () => {
+			if (!store.state.isConnected) {
+				return;
+			}
+
+			let lastMessage = -1;
+
+			// Find the id of first message that isn't showInActive
+			// If showInActive is set, this message is actually in another channel
+			for (const message of props.channel.messages) {
+				if (!message.showInActive) {
+					lastMessage = message.id;
+					break;
+				}
+			}
+
+			props.channel.historyLoading = true;
+
+			socket.emit("more", {
+				target: props.channel.id,
+				lastId: lastMessage,
+				condensed: store.state.settings.statusMessages !== "shown",
+			});
+		};
+
+		const onLoadButtonObserved = (entries: IntersectionObserverEntry[]) => {
+			entries.forEach((entry) => {
+				if (!entry.isIntersecting) {
+					return;
+				}
+
+				onShowMoreClick();
+			});
+		};
+
+		nextTick(() => {
+			if (!chat.value) {
+				return;
+			}
+
+			if (window.IntersectionObserver) {
+				historyObserver.value = new window.IntersectionObserver(onLoadButtonObserved, {
+					root: chat.value,
+				});
+			}
+
+			jumpToBottom();
+		}).catch((e) => {
+			// eslint-disable-next-line no-console
+			console.error("Error in new IntersectionObserver", e);
+		});
+
+		const condensedMessages = computed(() => {
+			if (props.channel.type !== "channel") {
+				return props.channel.messages;
 			}
 
 			// If actions are hidden, just return a message list with them excluded
-			if (this.$store.state.settings.statusMessages === "hidden") {
-				return this.channel.messages.filter(
+			if (store.state.settings.statusMessages === "hidden") {
+				return props.channel.messages.filter(
 					(message) => !constants.condensedTypes.has(message.type)
 				);
 			}
 
 			// If actions are not condensed, just return raw message list
-			if (this.$store.state.settings.statusMessages !== "condensed") {
-				return this.channel.messages;
+			if (store.state.settings.statusMessages !== "condensed") {
+				return props.channel.messages;
 			}
 
-			const condensed = [];
-			let lastCondensedContainer = null;
+			let lastCondensedContainer: CondensedMessageContainer | null = null;
 
-			for (const message of this.channel.messages) {
+			const condensed: (ClientMessage | CondensedMessageContainer)[] = [];
+
+			for (const message of props.channel.messages) {
 				// If this message is not condensable, or its an action affecting our user,
 				// then just append the message to container and be done with it
 				if (
@@ -116,7 +212,7 @@ export default {
 					continue;
 				}
 
-				if (lastCondensedContainer === null) {
+				if (!lastCondensedContainer) {
 					lastCondensedContainer = {
 						time: message.time,
 						type: "condensed",
@@ -126,14 +222,14 @@ export default {
 					condensed.push(lastCondensedContainer);
 				}
 
-				lastCondensedContainer.messages.push(message);
+				lastCondensedContainer!.messages.push(message);
 
 				// Set id of the condensed container to last message id,
 				// which is required for the unread marker to work correctly
-				lastCondensedContainer.id = message.id;
+				lastCondensedContainer!.id = message.id;
 
 				// If this message is the unread boundary, create a split condensed container
-				if (message.id === this.channel.firstUnread) {
+				if (message.id === props.channel.firstUnread) {
 					lastCondensedContainer = null;
 				}
 			}
@@ -147,70 +243,13 @@ export default {
 
 				return message;
 			});
-		},
-	},
-	watch: {
-		"channel.id"() {
-			this.channel.scrolledToBottom = true;
-
-			// Re-add the intersection observer to trigger the check again on channel switch
-			// Otherwise if last channel had the button visible, switching to a new channel won't trigger the history
-			if (this.historyObserver) {
-				this.historyObserver.unobserve(this.$refs.loadMoreButton);
-				this.historyObserver.observe(this.$refs.loadMoreButton);
-			}
-		},
-		"channel.messages"() {
-			this.keepScrollPosition();
-		},
-		"channel.pendingMessage"() {
-			this.$nextTick(() => {
-				// Keep the scroll stuck when input gets resized while typing
-				this.keepScrollPosition();
-			});
-		},
-	},
-	created() {
-		this.$nextTick(() => {
-			if (!this.$refs.chat) {
-				return;
-			}
-
-			if (window.IntersectionObserver) {
-				this.historyObserver = new window.IntersectionObserver(this.onLoadButtonObserved, {
-					root: this.$refs.chat,
-				});
-			}
-
-			this.jumpToBottom();
 		});
-	},
-	mounted() {
-		this.$refs.chat.addEventListener("scroll", this.handleScroll, {passive: true});
 
-		eventbus.on("resize", this.handleResize);
-
-		this.$nextTick(() => {
-			if (this.historyObserver) {
-				this.historyObserver.observe(this.$refs.loadMoreButton);
-			}
-		});
-	},
-	beforeUpdate() {
-		unreadMarkerShown = false;
-	},
-	beforeDestroy() {
-		eventbus.off("resize", this.handleResize);
-		this.$refs.chat.removeEventListener("scroll", this.handleScroll);
-	},
-	destroyed() {
-		if (this.historyObserver) {
-			this.historyObserver.disconnect();
-		}
-	},
-	methods: {
-		shouldDisplayDateMarker(message, id) {
-			const previousMessage = this.condensedMessages[id - 1];
+		const shouldDisplayDateMarker = (
+			message: Msg | ClientMessage | CondensedMessageContainer,
+			id: number
+		) => {
+			const previousMessage = condensedMessages.value[id - 1];
 
 			if (!previousMessage) {
 				return true;
@@ -224,135 +263,180 @@ export default {
 				oldDate.getMonth() !== newDate.getMonth() ||
 				oldDate.getFullYear() !== newDate.getFullYear()
 			);
-		},
-		shouldDisplayUnreadMarker(id) {
-			if (!unreadMarkerShown && id > this.channel.firstUnread) {
+		};
+
+		const shouldDisplayUnreadMarker = (id: number) => {
+			if (!unreadMarkerShown && id > props.channel.firstUnread) {
 				unreadMarkerShown = true;
 				return true;
 			}
 
 			return false;
-		},
-		isPreviousSource(currentMessage, id) {
-			const previousMessage = this.condensedMessages[id - 1];
-			return (
+		};
+
+		const isPreviousSource = (currentMessage: ClientMessage | Msg, id: number) => {
+			const previousMessage = condensedMessages[id - 1];
+			return !!(
 				previousMessage &&
 				currentMessage.type === "message" &&
 				previousMessage.type === "message" &&
 				previousMessage.from &&
 				currentMessage.from.nick === previousMessage.from.nick
 			);
-		},
-		onCopy() {
-			clipboard(this.$el);
-		},
-		onLinkPreviewToggle(preview, message) {
-			this.keepScrollPosition();
+		};
+
+		const onCopy = () => {
+			if (chat.value) {
+				clipboard(chat.value);
+			}
+		};
+
+		const keepScrollPosition = async () => {
+			// If we are already waiting for the next tick to force scroll position,
+			// we have no reason to perform more checks and set it again in the next tick
+			if (isWaitingForNextTick.value) {
+				return;
+			}
+
+			const el = chat.value;
+
+			if (!el) {
+				return;
+			}
+
+			if (!props.channel.scrolledToBottom) {
+				if (props.channel.historyLoading) {
+					const heightOld = el.scrollHeight - el.scrollTop;
+
+					isWaitingForNextTick.value = true;
+
+					await nextTick();
+
+					isWaitingForNextTick.value = false;
+					skipNextScrollEvent.value = true;
+
+					el.scrollTop = el.scrollHeight - heightOld;
+				}
+
+				return;
+			}
+
+			isWaitingForNextTick.value = true;
+			await nextTick();
+			isWaitingForNextTick.value = false;
+
+			jumpToBottom();
+		};
+
+		const onLinkPreviewToggle = async (preview: ClientLinkPreview, message: ClientMessage) => {
+			await keepScrollPosition();
 
 			// Tell the server we're toggling so it remembers at page reload
 			socket.emit("msg:preview:toggle", {
-				target: this.channel.id,
+				target: props.channel.id,
 				msgId: message.id,
 				link: preview.link,
 				shown: preview.shown,
 			});
-		},
-		onShowMoreClick() {
-			if (!this.$store.state.isConnected) {
-				return;
-			}
+		};
 
-			let lastMessage = -1;
-
-			// Find the id of first message that isn't showInActive
-			// If showInActive is set, this message is actually in another channel
-			for (const message of this.channel.messages) {
-				if (!message.showInActive) {
-					lastMessage = message.id;
-					break;
-				}
-			}
-
-			this.channel.historyLoading = true;
-
-			socket.emit("more", {
-				target: this.channel.id,
-				lastId: lastMessage,
-				condensed: this.$store.state.settings.statusMessages !== "shown",
-			});
-		},
-		onLoadButtonObserved(entries) {
-			entries.forEach((entry) => {
-				if (!entry.isIntersecting) {
-					return;
-				}
-
-				this.onShowMoreClick();
-			});
-		},
-		keepScrollPosition() {
-			// If we are already waiting for the next tick to force scroll position,
-			// we have no reason to perform more checks and set it again in the next tick
-			if (this.isWaitingForNextTick) {
-				return;
-			}
-
-			const el = this.$refs.chat;
-
-			if (!el) {
-				return;
-			}
-
-			if (!this.channel.scrolledToBottom) {
-				if (this.channel.historyLoading) {
-					const heightOld = el.scrollHeight - el.scrollTop;
-
-					this.isWaitingForNextTick = true;
-					this.$nextTick(() => {
-						this.isWaitingForNextTick = false;
-						this.skipNextScrollEvent = true;
-						el.scrollTop = el.scrollHeight - heightOld;
-					});
-				}
-
-				return;
-			}
-
-			this.isWaitingForNextTick = true;
-			this.$nextTick(() => {
-				this.isWaitingForNextTick = false;
-				this.jumpToBottom();
-			});
-		},
-		handleScroll() {
+		const handleScroll = () => {
 			// Setting scrollTop also triggers scroll event
 			// We don't want to perform calculations for that
-			if (this.skipNextScrollEvent) {
-				this.skipNextScrollEvent = false;
+			if (skipNextScrollEvent.value) {
+				skipNextScrollEvent.value = false;
 				return;
 			}
 
-			const el = this.$refs.chat;
+			const el = chat.value;
 
 			if (!el) {
 				return;
 			}
 
-			this.channel.scrolledToBottom = el.scrollHeight - el.scrollTop - el.offsetHeight <= 30;
-		},
-		handleResize() {
-			// Keep message list scrolled to bottom on resize
-			if (this.channel.scrolledToBottom) {
-				this.jumpToBottom();
-			}
-		},
-		jumpToBottom() {
-			this.skipNextScrollEvent = true;
-			this.channel.scrolledToBottom = true;
+			props.channel.scrolledToBottom = el.scrollHeight - el.scrollTop - el.offsetHeight <= 30;
+		};
 
-			const el = this.$refs.chat;
-			el.scrollTop = el.scrollHeight;
-		},
+		const handleResize = () => {
+			// Keep message list scrolled to bottom on resize
+			if (props.channel.scrolledToBottom) {
+				jumpToBottom();
+			}
+		};
+
+		onMounted(() => {
+			chat.value?.addEventListener("scroll", handleScroll, {passive: true});
+
+			eventbus.on("resize", handleResize);
+
+			void nextTick(() => {
+				if (historyObserver.value && loadMoreButton.value) {
+					historyObserver.value.observe(loadMoreButton.value);
+				}
+			});
+		});
+
+		watch(
+			() => props.channel.id,
+			() => {
+				props.channel.scrolledToBottom = true;
+
+				// Re-add the intersection observer to trigger the check again on channel switch
+				// Otherwise if last channel had the button visible, switching to a new channel won't trigger the history
+				if (historyObserver.value && loadMoreButton.value) {
+					historyObserver.value.unobserve(loadMoreButton.value);
+					historyObserver.value.observe(loadMoreButton.value);
+				}
+			}
+		);
+
+		watch(
+			() => props.channel.messages,
+			async () => {
+				await keepScrollPosition();
+			},
+			{
+				deep: true,
+			}
+		);
+
+		watch(
+			() => props.channel.pendingMessage,
+			async () => {
+				// Keep the scroll stuck when input gets resized while typing
+				await keepScrollPosition();
+			}
+		);
+
+		onBeforeUpdate(() => {
+			unreadMarkerShown = false;
+		});
+
+		onBeforeUnmount(() => {
+			eventbus.off("resize", handleResize);
+			chat.value?.removeEventListener("scroll", handleScroll);
+		});
+
+		onUnmounted(() => {
+			if (historyObserver.value) {
+				historyObserver.value.disconnect();
+			}
+		});
+
+		return {
+			chat,
+			store,
+			onShowMoreClick,
+			loadMoreButton,
+			onCopy,
+			condensedMessages,
+			shouldDisplayDateMarker,
+			shouldDisplayUnreadMarker,
+			keepScrollPosition,
+			isPreviousSource,
+			jumpToBottom,
+			onLinkPreviewToggle,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/MessageSearchForm.vue b/client/components/MessageSearchForm.vue
index 6f22fce3..98b1a0b2 100644
--- a/client/components/MessageSearchForm.vue
+++ b/client/components/MessageSearchForm.vue
@@ -80,77 +80,96 @@ form.message-search.opened .input-wrapper {
 }
 </style>
 
-<script>
-export default {
+<script lang="ts">
+import {computed, defineComponent, onMounted, PropType, ref, watch} from "vue";
+import {useRoute, useRouter} from "vue-router";
+import eventbus from "../js/eventbus";
+import {ClientNetwork, ClientChan} from "../js/types";
+
+export default defineComponent({
 	name: "MessageSearchForm",
 	props: {
-		network: Object,
-		channel: Object,
+		network: {type: Object as PropType<ClientNetwork>, required: true},
+		channel: {type: Object as PropType<ClientChan>, required: true},
 	},
-	data() {
-		return {
-			searchOpened: false,
-			searchInput: "",
-		};
-	},
-	computed: {
-		onSearchPage() {
-			return this.$route.name === "SearchResults";
-		},
-	},
-	watch: {
-		"$route.query.q"() {
-			this.searchInput = this.$route.query.q;
-		},
-	},
-	mounted() {
-		this.searchInput = this.$route.query.q;
-		this.searchOpened = this.onSearchPage;
+	setup(props) {
+		const searchOpened = ref(false);
+		const searchInput = ref("");
+		const router = useRouter();
+		const route = useRoute();
 
-		if (!this.searchInput && this.searchOpened) {
-			this.$refs.searchInputField.focus();
-		}
-	},
-	methods: {
-		closeSearch() {
-			if (!this.onSearchPage) {
-				this.searchInput = "";
-				this.searchOpened = false;
+		const searchInputField = ref<HTMLInputElement | null>(null);
+
+		const onSearchPage = computed(() => {
+			return route.name === "SearchResults";
+		});
+
+		watch(route, (newValue) => {
+			if (newValue.query.q) {
+				searchInput.value = String(newValue.query.q);
 			}
-		},
-		toggleSearch() {
-			if (this.searchOpened) {
-				this.$refs.searchInputField.blur();
+		});
+
+		onMounted(() => {
+			searchInput.value = String(route.query.q || "");
+			searchOpened.value = onSearchPage.value;
+
+			if (searchInputField.value && !searchInput.value && searchOpened.value) {
+				searchInputField.value.focus();
+			}
+		});
+
+		const closeSearch = () => {
+			if (!onSearchPage.value) {
+				searchInput.value = "";
+				searchOpened.value = false;
+			}
+		};
+
+		const toggleSearch = () => {
+			if (searchOpened.value) {
+				searchInputField.value?.blur();
 				return;
 			}
 
-			this.searchOpened = true;
-			this.$refs.searchInputField.focus();
-		},
-		searchMessages(event) {
+			searchOpened.value = true;
+			searchInputField.value?.focus();
+		};
+
+		const searchMessages = (event: Event) => {
 			event.preventDefault();
 
-			if (!this.searchInput) {
+			if (!searchInput.value) {
 				return;
 			}
 
-			this.$router
+			router
 				.push({
 					name: "SearchResults",
 					params: {
-						id: this.channel.id,
+						id: props.channel.id,
 					},
 					query: {
-						q: this.searchInput,
+						q: searchInput.value,
 					},
 				})
 				.catch((err) => {
 					if (err.name === "NavigationDuplicated") {
 						// Search for the same query again
-						this.$root.$emit("re-search");
+						eventbus.emit("re-search");
 					}
 				});
-		},
+		};
+
+		return {
+			searchOpened,
+			searchInput,
+			searchInputField,
+			closeSearch,
+			toggleSearch,
+			searchMessages,
+			onSearchPage,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/away.vue b/client/components/MessageTypes/away.vue
index 6963257c..39ca76d1 100644
--- a/client/components/MessageTypes/away.vue
+++ b/client/components/MessageTypes/away.vue
@@ -9,19 +9,27 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import type {ClientNetwork, ClientMessage} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeAway",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/back.vue b/client/components/MessageTypes/back.vue
index 4feac170..759d1e33 100644
--- a/client/components/MessageTypes/back.vue
+++ b/client/components/MessageTypes/back.vue
@@ -8,19 +8,27 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeBack",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/chghost.vue b/client/components/MessageTypes/chghost.vue
index e54c245d..0f6cd8f4 100644
--- a/client/components/MessageTypes/chghost.vue
+++ b/client/components/MessageTypes/chghost.vue
@@ -12,19 +12,27 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeChangeHost",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/ctcp.vue b/client/components/MessageTypes/ctcp.vue
index 4e9cc53c..7b85afc3 100644
--- a/client/components/MessageTypes/ctcp.vue
+++ b/client/components/MessageTypes/ctcp.vue
@@ -1,23 +1,31 @@
 <template>
 	<span class="content">
-		<Username :user="message.from" />&#32;
-		<span class="ctcp-message"><ParsedMessage :text="message.ctcpMessage" /></span>
+		<Username :user="message.from" />
+		{{ `&#32;` }}<span class="ctcp-message"><ParsedMessage :text="message.ctcpMessage" /></span>
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeCTCP",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/ctcp_request.vue b/client/components/MessageTypes/ctcp_request.vue
index 592441cd..310bfacd 100644
--- a/client/components/MessageTypes/ctcp_request.vue
+++ b/client/components/MessageTypes/ctcp_request.vue
@@ -6,19 +6,27 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeRequestCTCP",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/error.vue b/client/components/MessageTypes/error.vue
index 0453f10a..24e09d45 100644
--- a/client/components/MessageTypes/error.vue
+++ b/client/components/MessageTypes/error.vue
@@ -4,55 +4,67 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
 import ParsedMessage from "../ParsedMessage.vue";
+import {computed, defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeError",
 	components: {
 		ParsedMessage,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-	computed: {
-		errorMessage() {
-			switch (this.message.error) {
+	setup(props) {
+		const errorMessage = computed(() => {
+			switch (props.message.error) {
 				case "bad_channel_key":
-					return `Cannot join ${this.message.channel} - Bad channel key.`;
+					return `Cannot join ${props.message.channel} - Bad channel key.`;
 				case "banned_from_channel":
-					return `Cannot join ${this.message.channel} - You have been banned from the channel.`;
+					return `Cannot join ${props.message.channel} - You have been banned from the channel.`;
 				case "cannot_send_to_channel":
-					return `Cannot send to channel ${this.message.channel}`;
+					return `Cannot send to channel ${props.message.channel}`;
 				case "channel_is_full":
-					return `Cannot join ${this.message.channel} - Channel is full.`;
+					return `Cannot join ${props.message.channel} - Channel is full.`;
 				case "chanop_privs_needed":
 					return "Cannot perform action: You're not a channel operator.";
 				case "invite_only_channel":
-					return `Cannot join ${this.message.channel} - Channel is invite only.`;
+					return `Cannot join ${props.message.channel} - Channel is invite only.`;
 				case "no_such_nick":
-					return `User ${this.message.nick} hasn't logged in or does not exist.`;
+					return `User ${props.message.nick} hasn't logged in or does not exist.`;
 				case "not_on_channel":
 					return "Cannot perform action: You're not on the channel.";
 				case "password_mismatch":
 					return "Password mismatch.";
 				case "too_many_channels":
-					return `Cannot join ${this.message.channel} - You've already reached the maximum number of channels allowed.`;
+					return `Cannot join ${props.message.channel} - You've already reached the maximum number of channels allowed.`;
 				case "unknown_command":
-					return `Unknown command: ${this.message.command}`;
+					return `Unknown command: ${props.message.command}`;
 				case "user_not_in_channel":
-					return `User ${this.message.nick} is not on the channel.`;
+					return `User ${props.message.nick} is not on the channel.`;
 				case "user_on_channel":
-					return `User ${this.message.nick} is already on the channel.`;
+					return `User ${props.message.nick} is already on the channel.`;
 				default:
-					if (this.message.reason) {
-						return `${this.message.reason} (${this.message.error})`;
+					if (props.message.reason) {
+						return `${props.message.reason} (${props.message.error})`;
 					}
 
-					return this.message.error;
+					return props.message.error;
 			}
-		},
+		});
+
+		return {
+			errorMessage,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/index.js b/client/components/MessageTypes/index.ts
similarity index 83%
rename from client/components/MessageTypes/index.js
rename to client/components/MessageTypes/index.ts
index 4d873bd6..412bcfbc 100644
--- a/client/components/MessageTypes/index.js
+++ b/client/components/MessageTypes/index.ts
@@ -1,12 +1,10 @@
-"use strict";
-
 // This creates a version of `require()` in the context of the current
 // directory, so we iterate over its content, which is a map statically built by
 // Webpack.
 // Second argument says it's recursive, third makes sure we only load templates.
 const requireViews = require.context(".", false, /\.vue$/);
 
-export default requireViews.keys().reduce((acc, path) => {
+export default requireViews.keys().reduce((acc: Record<string, any>, path) => {
 	acc["message-" + path.substring(2, path.length - 4)] = requireViews(path).default;
 
 	return acc;
diff --git a/client/components/MessageTypes/invite.vue b/client/components/MessageTypes/invite.vue
index e976091e..62c9f989 100644
--- a/client/components/MessageTypes/invite.vue
+++ b/client/components/MessageTypes/invite.vue
@@ -8,19 +8,27 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeInvite",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/join.vue b/client/components/MessageTypes/join.vue
index 9e635742..6d80b0ab 100644
--- a/client/components/MessageTypes/join.vue
+++ b/client/components/MessageTypes/join.vue
@@ -1,30 +1,38 @@
 <template>
 	<span class="content">
 		<Username :user="message.from" />
-		<i class="hostmask"> (<ParsedMessage :network="network" :text="message.hostmask" />)</i>
+		<i class="hostmask">&#32;(<ParsedMessage :network="network" :text="message.hostmask" />)</i>
 		<template v-if="message.account">
-			<i class="account"> [{{ message.account }}]</i>
+			<i class="account">&#32;[{{ message.account }}]</i>
 		</template>
 		<template v-if="message.gecos">
-			<i class="realname"> {{ message.gecos }}</i>
+			<i class="realname">&#32;({{ message.gecos }})</i>
 		</template>
 		has joined the channel
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeJoin",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/kick.vue b/client/components/MessageTypes/kick.vue
index 14a776c8..fa312595 100644
--- a/client/components/MessageTypes/kick.vue
+++ b/client/components/MessageTypes/kick.vue
@@ -9,19 +9,27 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeKick",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/mode.vue b/client/components/MessageTypes/mode.vue
index 4ca48bd2..08fac02a 100644
--- a/client/components/MessageTypes/mode.vue
+++ b/client/components/MessageTypes/mode.vue
@@ -6,19 +6,27 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeMode",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/mode_channel.vue b/client/components/MessageTypes/mode_channel.vue
index 109950bf..f79c9990 100644
--- a/client/components/MessageTypes/mode_channel.vue
+++ b/client/components/MessageTypes/mode_channel.vue
@@ -4,12 +4,21 @@
 	</span>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
+
+export default defineComponent({
 	name: "MessageChannelMode",
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/mode_user.vue b/client/components/MessageTypes/mode_user.vue
index 8c3185eb..a4ec7d01 100644
--- a/client/components/MessageTypes/mode_user.vue
+++ b/client/components/MessageTypes/mode_user.vue
@@ -4,12 +4,21 @@
 	</span>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
+
+export default defineComponent({
 	name: "MessageChannelMode",
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/monospace_block.vue b/client/components/MessageTypes/monospace_block.vue
index 9647335a..a1d29b1a 100644
--- a/client/components/MessageTypes/monospace_block.vue
+++ b/client/components/MessageTypes/monospace_block.vue
@@ -4,26 +4,34 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {computed, defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeMonospaceBlock",
 	components: {
 		ParsedMessage,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-	computed: {
-		cleanText() {
-			let lines = this.message.text.split("\n");
+	setup(props) {
+		const cleanText = computed(() => {
+			let lines = props.message.text.split("\n");
 
 			// If all non-empty lines of the MOTD start with a hyphen (which is common
 			// across MOTDs), remove all the leading hyphens.
 			if (lines.every((line) => line === "" || line[0] === "-")) {
-				lines = lines.map((line) => line.substr(2));
+				lines = lines.map((line) => line.substring(2));
 			}
 
 			// Remove empty lines around the MOTD (but not within it)
@@ -31,7 +39,11 @@ export default {
 				.map((line) => line.replace(/\s*$/, ""))
 				.join("\n")
 				.replace(/^[\r\n]+|[\r\n]+$/g, "");
-		},
+		});
+
+		return {
+			cleanText,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/nick.vue b/client/components/MessageTypes/nick.vue
index 53d300b6..b79b2a03 100644
--- a/client/components/MessageTypes/nick.vue
+++ b/client/components/MessageTypes/nick.vue
@@ -6,17 +6,25 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeNick",
 	components: {
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/part.vue b/client/components/MessageTypes/part.vue
index b2b18c2a..d889a166 100644
--- a/client/components/MessageTypes/part.vue
+++ b/client/components/MessageTypes/part.vue
@@ -9,19 +9,27 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypePart",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/quit.vue b/client/components/MessageTypes/quit.vue
index a34cd58c..810127ac 100644
--- a/client/components/MessageTypes/quit.vue
+++ b/client/components/MessageTypes/quit.vue
@@ -9,19 +9,27 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import type {ClientMessage, ClientNetwork} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeQuit",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/raw.vue b/client/components/MessageTypes/raw.vue
index 520e5087..a324a5ad 100644
--- a/client/components/MessageTypes/raw.vue
+++ b/client/components/MessageTypes/raw.vue
@@ -2,12 +2,21 @@
 	<span class="content">{{ message.text }}</span>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
+
+export default defineComponent({
 	name: "MessageTypeRaw",
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/topic.vue b/client/components/MessageTypes/topic.vue
index 7ec96e95..4e32c6e5 100644
--- a/client/components/MessageTypes/topic.vue
+++ b/client/components/MessageTypes/topic.vue
@@ -10,19 +10,27 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import type {ClientMessage, ClientNetwork} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeTopic",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
+		},
 	},
-};
+});
 </script>
diff --git a/client/components/MessageTypes/topic_set_by.vue b/client/components/MessageTypes/topic_set_by.vue
index 66559880..e077ad0f 100644
--- a/client/components/MessageTypes/topic_set_by.vue
+++ b/client/components/MessageTypes/topic_set_by.vue
@@ -6,23 +6,33 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
 import localetime from "../../js/helpers/localetime";
+import {computed, defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeTopicSetBy",
 	components: {
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
-	},
-	computed: {
-		messageTimeLocale() {
-			return localetime(this.message.when);
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
 		},
 	},
-};
+	setup(props) {
+		const messageTimeLocale = computed(() => localetime(props.message.when));
+
+		return {
+			messageTimeLocale,
+		};
+	},
+});
 </script>
diff --git a/client/components/MessageTypes/whois.vue b/client/components/MessageTypes/whois.vue
index 5a080788..3cfd5eea 100644
--- a/client/components/MessageTypes/whois.vue
+++ b/client/components/MessageTypes/whois.vue
@@ -55,9 +55,9 @@
 			</template>
 
 			<template v-if="message.whois.special">
-				<template v-for="special in message.whois.special">
-					<dt :key="special">Special:</dt>
-					<dd :key="special">{{ special }}</dd>
+				<template v-for="special in message.whois.special" :key="special">
+					<dt>Special:</dt>
+					<dd>{{ special }}</dd>
 				</template>
 			</template>
 
@@ -111,25 +111,33 @@
 	</span>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
 import localetime from "../../js/helpers/localetime";
+import {ClientNetwork, ClientMessage} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 import Username from "../Username.vue";
 
-export default {
+export default defineComponent({
 	name: "MessageTypeWhois",
 	components: {
 		ParsedMessage,
 		Username,
 	},
 	props: {
-		network: Object,
-		message: Object,
-	},
-	methods: {
-		localetime(date) {
-			return localetime(date);
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
+		message: {
+			type: Object as PropType<ClientMessage>,
+			required: true,
 		},
 	},
-};
+	setup() {
+		return {
+			localetime: (date: Date) => localetime(date),
+		};
+	},
+});
 </script>
diff --git a/client/components/NetworkForm.vue b/client/components/NetworkForm.vue
index 7eefaefd..0121484a 100644
--- a/client/components/NetworkForm.vue
+++ b/client/components/NetworkForm.vue
@@ -11,12 +11,14 @@
 				</template>
 				<template v-else>
 					Connect
-					<template v-if="config.lockNetwork && $store.state.serverConfiguration.public">
+					<template
+						v-if="config?.lockNetwork && store?.state.serverConfiguration?.public"
+					>
 						to {{ defaults.name }}
 					</template>
 				</template>
 			</h1>
-			<template v-if="!config.lockNetwork">
+			<template v-if="!config?.lockNetwork">
 				<h2>Network settings</h2>
 				<div class="connect-row">
 					<label for="connect:name">Name</label>
@@ -173,7 +175,7 @@
 					</div>
 				</template>
 			</template>
-			<template v-else-if="config.lockNetwork && !$store.state.serverConfiguration.public">
+			<template v-else-if="config.lockNetwork && !store.state.serverConfiguration?.public">
 				<h2>Network settings</h2>
 				<div class="connect-row">
 					<label for="connect:name">Name</label>
@@ -218,7 +220,7 @@
 					@input="onNickChanged"
 				/>
 			</div>
-			<template v-if="!config.useHexIp">
+			<template v-if="!config?.useHexIp">
 				<div class="connect-row">
 					<label for="connect:username">Username</label>
 					<input
@@ -252,7 +254,7 @@
 					placeholder="The Lounge - https://thelounge.chat"
 				/>
 			</div>
-			<template v-if="defaults.uuid && !$store.state.serverConfiguration.public">
+			<template v-if="defaults.uuid && !store.state.serverConfiguration?.public">
 				<div class="connect-row">
 					<label for="connect:commands">
 						Commands
@@ -288,8 +290,8 @@ the server tab on new connection"
 				</div>
 			</template>
 
-			<template v-if="$store.state.serverConfiguration.public">
-				<template v-if="config.lockNetwork">
+			<template v-if="store.state.serverConfiguration?.public">
+				<template v-if="config?.lockNetwork">
 					<div class="connect-row">
 						<label></label>
 						<div class="input-wrap">
@@ -343,7 +345,7 @@ the server tab on new connection"
 						Username + password (SASL PLAIN)
 					</label>
 					<label
-						v-if="!$store.state.serverConfiguration.public && defaults.tls"
+						v-if="!store.state.serverConfiguration?.public && defaults.tls"
 						class="opt"
 					>
 						<input
@@ -435,89 +437,134 @@ the server tab on new connection"
 }
 </style>
 
-<script>
+<script lang="ts">
 import RevealPassword from "./RevealPassword.vue";
 import SidebarToggle from "./SidebarToggle.vue";
+import {defineComponent, nextTick, PropType, ref, watch} from "vue";
+import {useStore} from "../js/store";
+import {ClientNetwork} from "../js/types";
 
-export default {
+export type NetworkFormDefaults = Partial<ClientNetwork> & {
+	join?: string;
+};
+
+export default defineComponent({
 	name: "NetworkForm",
 	components: {
 		RevealPassword,
 		SidebarToggle,
 	},
 	props: {
-		handleSubmit: Function,
-		defaults: Object,
+		handleSubmit: {
+			type: Function as PropType<(network: ClientNetwork) => void>,
+			required: true,
+		},
+		defaults: {
+			type: Object as PropType<NetworkFormDefaults>,
+			required: true,
+		},
 		disabled: Boolean,
 	},
-	data() {
-		return {
-			config: this.$store.state.serverConfiguration,
-			previousUsername: this.defaults.username,
-			displayPasswordField: false,
-		};
-	},
-	watch: {
-		displayPasswordField(value) {
-			if (value) {
-				this.$nextTick(() => this.$refs.publicPassword.focus());
-			}
-		},
-		"defaults.commands"() {
-			this.$nextTick(this.resizeCommandsInput);
-		},
-		"defaults.tls"(isSecureChecked) {
-			const ports = [6667, 6697];
-			const newPort = isSecureChecked ? 0 : 1;
+	setup(props) {
+		const store = useStore();
+		const config = ref(store.state.serverConfiguration);
+		const previousUsername = ref(props.defaults?.username);
+		const displayPasswordField = ref(false);
 
-			// If you disable TLS and current port is 6697,
-			// set it to 6667, and vice versa
-			if (this.defaults.port === ports[newPort]) {
-				this.defaults.port = ports[1 - newPort];
-			}
-		},
-	},
-	methods: {
-		setSaslAuth(type) {
-			this.defaults.sasl = type;
-		},
-		onNickChanged(event) {
-			// Username input is not available when useHexIp is set
-			if (!this.$refs.usernameInput) {
-				return;
-			}
+		const publicPassword = ref<HTMLInputElement | null>(null);
 
-			if (
-				!this.$refs.usernameInput.value ||
-				this.$refs.usernameInput.value === this.previousUsername
-			) {
-				this.$refs.usernameInput.value = event.target.value;
+		watch(displayPasswordField, (newValue) => {
+			if (newValue) {
+				void nextTick(() => {
+					publicPassword.value?.focus();
+				});
 			}
+		});
 
-			this.previousUsername = event.target.value;
-		},
-		onSubmit(event) {
-			const formData = new FormData(event.target);
-			const data = {};
+		const commandsInput = ref<HTMLInputElement | null>(null);
 
-			for (const item of formData.entries()) {
-				data[item[0]] = item[1];
-			}
-
-			this.handleSubmit(data);
-		},
-		resizeCommandsInput() {
-			if (!this.$refs.commandsInput) {
+		const resizeCommandsInput = () => {
+			if (!commandsInput.value) {
 				return;
 			}
 
 			// Reset height first so it can down size
-			this.$refs.commandsInput.style.height = "";
+			commandsInput.value.style.height = "";
 
 			// 2 pixels to account for the border
-			this.$refs.commandsInput.style.height =
-				Math.ceil(this.$refs.commandsInput.scrollHeight + 2) + "px";
-		},
+			commandsInput.value.style.height = `${Math.ceil(
+				commandsInput.value.scrollHeight + 2
+			)}px`;
+		};
+
+		watch(
+			() => props.defaults?.commands,
+			() => {
+				void nextTick(() => {
+					resizeCommandsInput();
+				});
+			}
+		);
+
+		watch(
+			() => props.defaults?.tls,
+			(isSecureChecked) => {
+				const ports = [6667, 6697];
+				const newPort = isSecureChecked ? 0 : 1;
+
+				// If you disable TLS and current port is 6697,
+				// set it to 6667, and vice versa
+				if (props.defaults?.port === ports[newPort]) {
+					props.defaults.port = ports[1 - newPort];
+				}
+			}
+		);
+
+		const setSaslAuth = (type: string) => {
+			if (props.defaults) {
+				props.defaults.sasl = type;
+			}
+		};
+
+		const usernameInput = ref<HTMLInputElement | null>(null);
+
+		const onNickChanged = (event: Event) => {
+			if (!usernameInput.value) {
+				return;
+			}
+
+			const usernameRef = usernameInput.value;
+
+			if (!usernameRef.value || usernameRef.value === previousUsername.value) {
+				usernameRef.value = (event.target as HTMLInputElement)?.value;
+			}
+
+			previousUsername.value = (event.target as HTMLInputElement)?.value;
+		};
+
+		const onSubmit = (event: Event) => {
+			const formData = new FormData(event.target as HTMLFormElement);
+			const data: Partial<ClientNetwork> = {};
+
+			formData.forEach((value, key) => {
+				data[key] = value;
+			});
+
+			props.handleSubmit(data as ClientNetwork);
+		};
+
+		return {
+			store,
+			config,
+			displayPasswordField,
+			publicPassword,
+			commandsInput,
+			resizeCommandsInput,
+			setSaslAuth,
+			usernameInput,
+			onNickChanged,
+			onSubmit,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/NetworkList.vue b/client/components/NetworkList.vue
index 4cd2fe11..3634b7e8 100644
--- a/client/components/NetworkList.vue
+++ b/client/components/NetworkList.vue
@@ -1,6 +1,6 @@
 <template>
 	<div
-		v-if="$store.state.networks.length === 0"
+		v-if="store.state.networks.length === 0"
 		class="empty"
 		role="navigation"
 		aria-label="Network and Channel list"
@@ -55,7 +55,7 @@
 		</div>
 		<Draggable
 			v-else
-			:list="$store.state.networks"
+			:list="store.state.networks"
 			:delay="LONG_TOUCH_DURATION"
 			:delay-on-touch-only="true"
 			:touch-start-threshold="10"
@@ -65,71 +65,79 @@
 			drag-class="ui-sortable-dragging"
 			group="networks"
 			class="networks"
+			item-key="uuid"
 			@change="onNetworkSort"
 			@choose="onDraggableChoose"
 			@unchoose="onDraggableUnchoose"
 		>
-			<div
-				v-for="network in $store.state.networks"
-				:id="'network-' + network.uuid"
-				:key="network.uuid"
-				:class="{
-					collapsed: network.isCollapsed,
-					'not-connected': !network.status.connected,
-					'not-secure': !network.status.secure,
-				}"
-				class="network"
-				role="region"
-				aria-live="polite"
-				@touchstart="onDraggableTouchStart"
-				@touchmove="onDraggableTouchMove"
-				@touchend="onDraggableTouchEnd"
-				@touchcancel="onDraggableTouchEnd"
-			>
-				<NetworkLobby
-					:network="network"
-					:is-join-channel-shown="network.isJoinChannelShown"
-					:active="
-						$store.state.activeChannel &&
-						network.channels[0] === $store.state.activeChannel.channel
-					"
-					@toggle-join-channel="network.isJoinChannelShown = !network.isJoinChannelShown"
-				/>
-				<JoinChannel
-					v-if="network.isJoinChannelShown"
-					:network="network"
-					:channel="network.channels[0]"
-					@toggle-join-channel="network.isJoinChannelShown = !network.isJoinChannelShown"
-				/>
-
-				<Draggable
-					draggable=".channel-list-item"
-					ghost-class="ui-sortable-ghost"
-					drag-class="ui-sortable-dragging"
-					:group="network.uuid"
-					:list="network.channels"
-					:delay="LONG_TOUCH_DURATION"
-					:delay-on-touch-only="true"
-					:touch-start-threshold="10"
-					class="channels"
-					@change="onChannelSort"
-					@choose="onDraggableChoose"
-					@unchoose="onDraggableUnchoose"
+			<template v-slot:item="{element: network}">
+				<div
+					:id="'network-' + network.uuid"
+					:key="network.uuid"
+					:class="{
+						collapsed: network.isCollapsed,
+						'not-connected': !network.status.connected,
+						'not-secure': !network.status.secure,
+					}"
+					class="network"
+					role="region"
+					aria-live="polite"
+					@touchstart="onDraggableTouchStart"
+					@touchmove="onDraggableTouchMove"
+					@touchend="onDraggableTouchEnd"
+					@touchcancel="onDraggableTouchEnd"
 				>
-					<template v-for="(channel, index) in network.channels">
-						<Channel
-							v-if="index > 0"
-							:key="channel.id"
-							:channel="channel"
-							:network="network"
-							:active="
-								$store.state.activeChannel &&
-								channel === $store.state.activeChannel.channel
-							"
-						/>
-					</template>
-				</Draggable>
-			</div>
+					<NetworkLobby
+						:network="network"
+						:is-join-channel-shown="network.isJoinChannelShown"
+						:active="
+							store.state.activeChannel &&
+							network.channels[0] === store.state.activeChannel.channel
+						"
+						@toggle-join-channel="
+							network.isJoinChannelShown = !network.isJoinChannelShown
+						"
+					/>
+					<JoinChannel
+						v-if="network.isJoinChannelShown"
+						:network="network"
+						:channel="network.channels[0]"
+						@toggle-join-channel="
+							network.isJoinChannelShown = !network.isJoinChannelShown
+						"
+					/>
+
+					<Draggable
+						draggable=".channel-list-item"
+						ghost-class="ui-sortable-ghost"
+						drag-class="ui-sortable-dragging"
+						:group="network.uuid"
+						:list="network.channels"
+						:delay="LONG_TOUCH_DURATION"
+						:delay-on-touch-only="true"
+						:touch-start-threshold="10"
+						class="channels"
+						item-key="name"
+						@change="onChannelSort"
+						@choose="onDraggableChoose"
+						@unchoose="onDraggableUnchoose"
+					>
+						<template v-slot:item="{element: channel, index}">
+							<Channel
+								v-if="index > 0"
+								:key="channel.id"
+								:data-item="channel.id"
+								:channel="channel"
+								:network="network"
+								:active="
+									store.state.activeChannel &&
+									channel === store.state.activeChannel.channel
+								"
+							/>
+						</template>
+					</Draggable>
+				</div>
+			</template>
 		</Draggable>
 	</div>
 </template>
@@ -195,21 +203,27 @@
 }
 </style>
 
-<script>
+<script lang="ts">
+import {computed, watch, defineComponent, nextTick, onBeforeUnmount, onMounted, ref} from "vue";
+
 import Mousetrap from "mousetrap";
-import Draggable from "vuedraggable";
+import Draggable from "./Draggable.vue";
 import {filter as fuzzyFilter} from "fuzzy";
 import NetworkLobby from "./NetworkLobby.vue";
 import Channel from "./Channel.vue";
 import JoinChannel from "./JoinChannel.vue";
 
 import socket from "../js/socket";
-import collapseNetwork from "../js/helpers/collapseNetwork";
+import collapseNetworkHelper from "../js/helpers/collapseNetwork";
 import isIgnoredKeybind from "../js/helpers/isIgnoredKeybind";
 import distance from "../js/helpers/distance";
 import eventbus from "../js/eventbus";
+import {ClientChan, NetChan} from "../js/types";
+import {useStore} from "../js/store";
+import {switchToChannel} from "../js/router";
+import Sortable from "sortablejs";
 
-export default {
+export default defineComponent({
 	name: "NetworkList",
 	components: {
 		JoinChannel,
@@ -217,120 +231,137 @@ export default {
 		Channel,
 		Draggable,
 	},
-	data() {
-		return {
-			searchText: "",
-			activeSearchItem: null,
-		};
-	},
-	computed: {
-		items() {
-			const items = [];
+	setup() {
+		const store = useStore();
+		const searchText = ref("");
+		const activeSearchItem = ref<ClientChan | null>();
+		// Number of milliseconds a touch has to last to be considered long
+		const LONG_TOUCH_DURATION = 500;
 
-			for (const network of this.$store.state.networks) {
+		const startDrag = ref<[number, number] | null>();
+		const searchInput = ref<HTMLInputElement | null>(null);
+		const networklist = ref<HTMLDivElement | null>(null);
+
+		const sidebarWasClosed = ref(false);
+
+		const moveItemInArray = <T>(array: T[], from: number, to: number) => {
+			const item = array.splice(from, 1)[0];
+			array.splice(to, 0, item);
+		};
+
+		const items = computed(() => {
+			const newItems: NetChan[] = [];
+
+			for (const network of store.state.networks) {
 				for (const channel of network.channels) {
 					if (
-						this.$store.state.activeChannel &&
-						channel === this.$store.state.activeChannel.channel
+						store.state.activeChannel &&
+						channel === store.state.activeChannel.channel
 					) {
 						continue;
 					}
 
-					items.push({network, channel});
+					newItems.push({network, channel});
 				}
 			}
 
-			return items;
-		},
-		results() {
-			const results = fuzzyFilter(this.searchText, this.items, {
+			return newItems;
+		});
+
+		const results = computed(() => {
+			const newResults = fuzzyFilter(searchText.value, items.value, {
 				extract: (item) => item.channel.name,
 			}).map((item) => item.original);
 
-			return results;
-		},
-	},
-	watch: {
-		searchText() {
-			this.setActiveSearchItem();
-		},
-	},
-	created() {
-		// Number of milliseconds a touch has to last to be considered long
-		this.LONG_TOUCH_DURATION = 500;
-	},
-	mounted() {
-		Mousetrap.bind("alt+shift+right", this.expandNetwork);
-		Mousetrap.bind("alt+shift+left", this.collapseNetwork);
-		Mousetrap.bind("alt+j", this.toggleSearch);
-	},
-	beforeDestroy() {
-		Mousetrap.unbind("alt+shift+right", this.expandNetwork);
-		Mousetrap.unbind("alt+shift+left", this.collapseNetwork);
-		Mousetrap.unbind("alt+j", this.toggleSearch);
-	},
-	methods: {
-		expandNetwork(event) {
+			return newResults;
+		});
+
+		const collapseNetwork = (event: Mousetrap.ExtendedKeyboardEvent) => {
 			if (isIgnoredKeybind(event)) {
 				return true;
 			}
 
-			if (this.$store.state.activeChannel) {
-				collapseNetwork(this.$store.state.activeChannel.network, false);
+			if (store.state.activeChannel) {
+				collapseNetworkHelper(store.state.activeChannel.network, true);
 			}
 
 			return false;
-		},
-		collapseNetwork(event) {
+		};
+
+		const expandNetwork = (event: Mousetrap.ExtendedKeyboardEvent) => {
 			if (isIgnoredKeybind(event)) {
 				return true;
 			}
 
-			if (this.$store.state.activeChannel) {
-				collapseNetwork(this.$store.state.activeChannel.network, true);
+			if (store.state.activeChannel) {
+				collapseNetworkHelper(store.state.activeChannel.network, false);
 			}
 
 			return false;
-		},
-		onNetworkSort(e) {
-			if (!e.moved) {
+		};
+
+		const onNetworkSort = (e: Sortable.SortableEvent) => {
+			const {oldIndex, newIndex} = e;
+
+			if (oldIndex === undefined || newIndex === undefined || oldIndex === newIndex) {
 				return;
 			}
 
+			moveItemInArray(store.state.networks, oldIndex, newIndex);
+
 			socket.emit("sort", {
 				type: "networks",
-				order: this.$store.state.networks.map((n) => n.uuid),
+				order: store.state.networks.map((n) => n.uuid),
 			});
-		},
-		onChannelSort(e) {
-			if (!e.moved) {
+		};
+
+		const onChannelSort = (e: Sortable.SortableEvent) => {
+			let {oldIndex, newIndex} = e;
+
+			if (oldIndex === undefined || newIndex === undefined || oldIndex === newIndex) {
 				return;
 			}
 
-			const channel = this.$store.getters.findChannel(e.moved.element.id);
+			// Indexes are offset by one due to the lobby
+			oldIndex += 1;
+			newIndex += 1;
 
-			if (!channel) {
+			const unparsedId = e.item.getAttribute("data-item");
+
+			if (!unparsedId) {
 				return;
 			}
 
+			const id = parseInt(unparsedId);
+			const netChan = store.getters.findChannel(id);
+
+			if (!netChan) {
+				return;
+			}
+
+			moveItemInArray(netChan.network.channels, oldIndex, newIndex);
+
 			socket.emit("sort", {
 				type: "channels",
-				target: channel.network.uuid,
-				order: channel.network.channels.map((c) => c.id),
+				target: netChan.network.uuid,
+				order: netChan.network.channels.map((c) => c.id),
 			});
-		},
-		isTouchEvent(event) {
+		};
+
+		const isTouchEvent = (event: any): boolean => {
 			// This is the same way Sortable.js detects a touch event. See
 			// SortableJS/Sortable@daaefeda:/src/Sortable.js#L465
-			return (
+
+			return !!(
 				(event.touches && event.touches[0]) ||
 				(event.pointerType && event.pointerType === "touch")
 			);
-		},
-		onDraggableChoose(event) {
+		};
+
+		const onDraggableChoose = (event: any) => {
 			const original = event.originalEvent;
 
-			if (this.isTouchEvent(original)) {
+			if (isTouchEvent(original)) {
 				// onDrag is only triggered when the user actually moves the
 				// dragged object but onChoose is triggered as soon as the
 				// item is eligible for dragging. This gives us an opportunity
@@ -338,120 +369,147 @@ export default {
 				event.item.classList.add("ui-sortable-dragging-touch-cue");
 
 				if (original instanceof TouchEvent && original.touches.length > 0) {
-					this.startDrag = [original.touches[0].clientX, original.touches[0].clientY];
+					startDrag.value = [original.touches[0].clientX, original.touches[0].clientY];
 				} else if (original instanceof PointerEvent) {
-					this.startDrag = [original.clientX, original.clientY];
+					startDrag.value = [original.clientX, original.clientY];
 				}
 			}
-		},
-		onDraggableUnchoose(event) {
+		};
+
+		const onDraggableUnchoose = (event: any) => {
 			event.item.classList.remove("ui-sortable-dragging-touch-cue");
-			this.startDrag = null;
-		},
-		onDraggableTouchStart(event) {
+			startDrag.value = null;
+		};
+
+		const onDraggableTouchStart = (event: TouchEvent) => {
 			if (event.touches.length === 1) {
 				// This prevents an iOS long touch default behavior: selecting
 				// the nearest selectable text.
 				document.body.classList.add("force-no-select");
 			}
-		},
-		onDraggableTouchMove(event) {
-			if (this.startDrag && event.touches.length > 0) {
+		};
+
+		const onDraggableTouchMove = (event: TouchEvent) => {
+			if (startDrag.value && event.touches.length > 0) {
 				const touch = event.touches[0];
 				const currentPosition = [touch.clientX, touch.clientY];
 
-				if (distance(this.startDrag, currentPosition) > 10) {
+				if (distance(startDrag.value, currentPosition as [number, number]) > 10) {
 					// Context menu is shown on Android after long touch.
 					// Dismiss it now that we're sure the user is dragging.
 					eventbus.emit("contextmenu:cancel");
 				}
 			}
-		},
-		onDraggableTouchEnd(event) {
+		};
+
+		const onDraggableTouchEnd = (event: TouchEvent) => {
 			if (event.touches.length === 0) {
 				document.body.classList.remove("force-no-select");
 			}
-		},
-		toggleSearch(event) {
+		};
+
+		const activateSearch = () => {
+			if (searchInput.value === document.activeElement) {
+				return;
+			}
+
+			sidebarWasClosed.value = store.state.sidebarOpen ? false : true;
+			store.commit("sidebarOpen", true);
+
+			void nextTick(() => {
+				searchInput.value?.focus();
+			});
+		};
+
+		const deactivateSearch = () => {
+			activeSearchItem.value = null;
+			searchText.value = "";
+			searchInput.value?.blur();
+
+			if (sidebarWasClosed.value) {
+				store.commit("sidebarOpen", false);
+			}
+		};
+
+		const toggleSearch = (event: Mousetrap.ExtendedKeyboardEvent) => {
 			if (isIgnoredKeybind(event)) {
 				return true;
 			}
 
-			if (this.$refs.searchInput === document.activeElement) {
-				this.deactivateSearch();
+			if (searchInput.value === document.activeElement) {
+				deactivateSearch();
 				return false;
 			}
 
-			this.activateSearch();
+			activateSearch();
 			return false;
-		},
-		activateSearch() {
-			if (this.$refs.searchInput === document.activeElement) {
-				return;
-			}
+		};
 
-			this.sidebarWasClosed = this.$store.state.sidebarOpen ? false : true;
-			this.$store.commit("sidebarOpen", true);
-			this.$nextTick(() => {
-				this.$refs.searchInput.focus();
-			});
-		},
-		deactivateSearch() {
-			this.activeSearchItem = null;
-			this.searchText = "";
-			this.$refs.searchInput.blur();
+		const setSearchText = (e: Event) => {
+			searchText.value = (e.target as HTMLInputElement).value;
+		};
 
-			if (this.sidebarWasClosed) {
-				this.$store.commit("sidebarOpen", false);
-			}
-		},
-		setSearchText(e) {
-			this.searchText = e.target.value;
-		},
-		setActiveSearchItem(channel) {
-			if (!this.results.length) {
+		const setActiveSearchItem = (channel?: ClientChan) => {
+			if (!results.value.length) {
 				return;
 			}
 
 			if (!channel) {
-				channel = this.results[0].channel;
+				channel = results.value[0].channel;
 			}
 
-			this.activeSearchItem = channel;
-		},
-		selectResult() {
-			if (!this.searchText || !this.results.length) {
+			activeSearchItem.value = channel;
+		};
+
+		const scrollToActive = () => {
+			// Scroll the list if needed after the active class is applied
+			void nextTick(() => {
+				const el = networklist.value?.querySelector(".channel-list-item.active");
+
+				if (el) {
+					el.scrollIntoView({block: "nearest", inline: "nearest"});
+				}
+			});
+		};
+
+		const selectResult = () => {
+			if (!searchText.value || !results.value.length) {
 				return;
 			}
 
-			this.$root.switchToChannel(this.activeSearchItem);
-			this.deactivateSearch();
-			this.scrollToActive();
-		},
-		navigateResults(event, direction) {
+			if (activeSearchItem.value) {
+				switchToChannel(activeSearchItem.value);
+				deactivateSearch();
+				scrollToActive();
+			}
+		};
+
+		const navigateResults = (event: Event, direction: number) => {
 			// Prevent propagation to stop global keybind handler from capturing pagedown/pageup
 			// and redirecting it to the message list container for scrolling
 			event.stopImmediatePropagation();
 			event.preventDefault();
 
-			if (!this.searchText) {
+			if (!searchText.value) {
 				return;
 			}
 
-			const channels = this.results.map((r) => r.channel);
+			const channels = results.value.map((r) => r.channel);
 
 			// Bail out if there's no channels to select
 			if (!channels.length) {
-				this.activeSearchItem = null;
+				activeSearchItem.value = null;
 				return;
 			}
 
-			let currentIndex = channels.indexOf(this.activeSearchItem);
+			let currentIndex = activeSearchItem.value
+				? channels.indexOf(activeSearchItem.value)
+				: -1;
 
 			// If there's no active channel select the first or last one depending on direction
-			if (!this.activeSearchItem || currentIndex === -1) {
-				this.activeSearchItem = direction ? channels[0] : channels[channels.length - 1];
-				this.scrollToActive();
+			if (!activeSearchItem.value || currentIndex === -1) {
+				activeSearchItem.value = direction ? channels[0] : channels[channels.length - 1];
+				scrollToActive();
 				return;
 			}
 
@@ -467,19 +525,54 @@ export default {
 				currentIndex -= channels.length;
 			}
 
-			this.activeSearchItem = channels[currentIndex];
-			this.scrollToActive();
-		},
-		scrollToActive() {
-			// Scroll the list if needed after the active class is applied
-			this.$nextTick(() => {
-				const el = this.$refs.networklist.querySelector(".channel-list-item.active");
+			activeSearchItem.value = channels[currentIndex];
+			scrollToActive();
+		};
 
-				if (el) {
-					el.scrollIntoView({block: "nearest", inline: "nearest"});
-				}
-			});
-		},
+		watch(searchText, () => {
+			setActiveSearchItem();
+		});
+
+		onMounted(() => {
+			Mousetrap.bind("alt+shift+right", expandNetwork);
+			Mousetrap.bind("alt+shift+left", collapseNetwork);
+			Mousetrap.bind("alt+j", toggleSearch);
+		});
+
+		onBeforeUnmount(() => {
+			Mousetrap.unbind("alt+shift+right");
+			Mousetrap.unbind("alt+shift+left");
+			Mousetrap.unbind("alt+j");
+		});
+
+		const networkContainerRef = ref<HTMLDivElement>();
+		const channelRefs = ref<{[key: string]: HTMLDivElement}>({});
+
+		return {
+			store,
+			networklist,
+			searchInput,
+			searchText,
+			results,
+			activeSearchItem,
+			LONG_TOUCH_DURATION,
+
+			activateSearch,
+			deactivateSearch,
+			toggleSearch,
+			setSearchText,
+			setActiveSearchItem,
+			scrollToActive,
+			selectResult,
+			navigateResults,
+			onChannelSort,
+			onNetworkSort,
+			onDraggableTouchStart,
+			onDraggableTouchMove,
+			onDraggableTouchEnd,
+			onDraggableChoose,
+			onDraggableUnchoose,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/NetworkLobby.vue b/client/components/NetworkLobby.vue
index 1b94c22d..a2c08660 100644
--- a/client/components/NetworkLobby.vue
+++ b/client/components/NetworkLobby.vue
@@ -45,40 +45,57 @@
 	</ChannelWrapper>
 </template>
 
-<script>
+<script lang="ts">
+import {computed, defineComponent, PropType} from "vue";
 import collapseNetwork from "../js/helpers/collapseNetwork";
 import roundBadgeNumber from "../js/helpers/roundBadgeNumber";
 import ChannelWrapper from "./ChannelWrapper.vue";
 
-export default {
+import type {ClientChan, ClientNetwork} from "../js/types";
+
+export default defineComponent({
 	name: "Channel",
 	components: {
 		ChannelWrapper,
 	},
 	props: {
-		network: Object,
+		network: {
+			type: Object as PropType<ClientNetwork>,
+			required: true,
+		},
 		isJoinChannelShown: Boolean,
 		active: Boolean,
 		isFiltering: Boolean,
 	},
-	computed: {
-		channel() {
-			return this.network.channels[0];
-		},
-		joinChannelLabel() {
-			return this.isJoinChannelShown ? "Cancel" : "Join a channel…";
-		},
-		unreadCount() {
-			return roundBadgeNumber(this.channel.unread);
-		},
-	},
-	methods: {
-		onCollapseClick() {
-			collapseNetwork(this.network, !this.network.isCollapsed);
-		},
-		getExpandLabel(network) {
+	emits: ["toggle-join-channel"],
+	setup(props) {
+		const channel = computed(() => {
+			return props.network.channels[0];
+		});
+
+		const joinChannelLabel = computed(() => {
+			return props.isJoinChannelShown ? "Cancel" : "Join a channel…";
+		});
+
+		const unreadCount = computed(() => {
+			return roundBadgeNumber(channel.value.unread);
+		});
+
+		const onCollapseClick = () => {
+			collapseNetwork(props.network, !props.network.isCollapsed);
+		};
+
+		const getExpandLabel = (network: ClientNetwork) => {
 			return network.isCollapsed ? "Expand" : "Collapse";
-		},
+		};
+
+		return {
+			channel,
+			joinChannelLabel,
+			unreadCount,
+			onCollapseClick,
+			getExpandLabel,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/ParsedMessage.vue b/client/components/ParsedMessage.vue
index 842cbb34..95311a09 100644
--- a/client/components/ParsedMessage.vue
+++ b/client/components/ParsedMessage.vue
@@ -1,23 +1,22 @@
-<script>
+<script lang="ts">
+import {defineComponent, PropType, h} from "vue";
 import parse from "../js/helpers/parse";
+import type {ClientMessage, ClientNetwork} from "../js/types";
 
-export default {
+export default defineComponent({
 	name: "ParsedMessage",
 	functional: true,
 	props: {
 		text: String,
-		message: Object,
-		network: Object,
+		message: {type: Object as PropType<ClientMessage | string>, required: false},
+		network: {type: Object as PropType<ClientNetwork>, required: false},
 	},
-	render(createElement, context) {
+	render(context) {
 		return parse(
-			createElement,
-			typeof context.props.text !== "undefined"
-				? context.props.text
-				: context.props.message.text,
-			context.props.message,
-			context.props.network
+			typeof context.text !== "undefined" ? context.text : context.message.text,
+			context.message,
+			context.network
 		);
 	},
-};
+});
 </script>
diff --git a/client/components/RevealPassword.vue b/client/components/RevealPassword.vue
index d9d1323c..fcc2f804 100644
--- a/client/components/RevealPassword.vue
+++ b/client/components/RevealPassword.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<slot :isVisible="isVisible" />
+		<slot :is-visible="isVisible" />
 		<span
 			ref="revealButton"
 			type="button"
@@ -16,18 +16,22 @@
 	</div>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import {defineComponent, ref} from "vue";
+
+export default defineComponent({
 	name: "RevealPassword",
-	data() {
+	setup() {
+		const isVisible = ref(false);
+
+		const onClick = () => {
+			isVisible.value = !isVisible.value;
+		};
+
 		return {
-			isVisible: false,
+			isVisible,
+			onClick,
 		};
 	},
-	methods: {
-		onClick() {
-			this.isVisible = !this.isVisible;
-		},
-	},
-};
+});
 </script>
diff --git a/client/components/RoutedChat.vue b/client/components/RoutedChat.vue
index 50a40898..21452e1d 100644
--- a/client/components/RoutedChat.vue
+++ b/client/components/RoutedChat.vue
@@ -3,38 +3,64 @@
 		v-if="activeChannel"
 		:network="activeChannel.network"
 		:channel="activeChannel.channel"
-		:focused="$route.query.focused"
+		:focused="parseInt(String(route.query.focused), 10)"
+		@channel-changed="channelChanged"
 	/>
 </template>
 
-<script>
+<script lang="ts">
+import {watch, computed, defineComponent, onMounted} from "vue";
+import {useRoute} from "vue-router";
+import {useStore} from "../js/store";
+import {ClientChan} from "../js/types";
+
 // Temporary component for routing channels and lobbies
 import Chat from "./Chat.vue";
 
-export default {
+export default defineComponent({
 	name: "RoutedChat",
 	components: {
 		Chat,
 	},
-	computed: {
-		activeChannel() {
-			const chanId = parseInt(this.$route.params.id, 10);
-			const channel = this.$store.getters.findChannel(chanId);
+	setup() {
+		const route = useRoute();
+		const store = useStore();
+
+		const activeChannel = computed(() => {
+			const chanId = parseInt(String(route.params.id || ""), 10);
+			const channel = store.getters.findChannel(chanId);
 			return channel;
-		},
+		});
+
+		const setActiveChannel = () => {
+			if (activeChannel.value) {
+				store.commit("activeChannel", activeChannel.value);
+			}
+		};
+
+		watch(activeChannel, () => {
+			setActiveChannel();
+		});
+
+		onMounted(() => {
+			setActiveChannel();
+		});
+
+		const channelChanged = (channel: ClientChan) => {
+			const chanId = channel.id;
+			const chanInStore = store.getters.findChannel(chanId);
+
+			if (chanInStore?.channel) {
+				chanInStore.channel.unread = 0;
+				chanInStore.channel.highlight = 0;
+			}
+		};
+
+		return {
+			route,
+			activeChannel,
+			channelChanged,
+		};
 	},
-	watch: {
-		activeChannel() {
-			this.setActiveChannel();
-		},
-	},
-	mounted() {
-		this.setActiveChannel();
-	},
-	methods: {
-		setActiveChannel() {
-			this.$store.commit("activeChannel", this.activeChannel);
-		},
-	},
-};
+});
 </script>
diff --git a/client/components/Session.vue b/client/components/Session.vue
index 5dd07813..f827d43c 100644
--- a/client/components/Session.vue
+++ b/client/components/Session.vue
@@ -45,30 +45,39 @@
 }
 </style>
 
-<script>
+<script lang="ts">
+import {computed, defineComponent, PropType} from "vue";
 import localetime from "../js/helpers/localetime";
 import Auth from "../js/auth";
 import socket from "../js/socket";
+import {ClientSession} from "../js/store";
 
-export default {
+export default defineComponent({
 	name: "Session",
 	props: {
-		session: Object,
-	},
-	computed: {
-		lastUse() {
-			return localetime(this.session.lastUse);
+		session: {
+			type: Object as PropType<ClientSession>,
+			required: true,
 		},
 	},
-	methods: {
-		signOut() {
-			if (!this.session.current) {
-				socket.emit("sign-out", this.session.token);
+	setup(props) {
+		const lastUse = computed(() => {
+			return localetime(props.session.lastUse);
+		});
+
+		const signOut = () => {
+			if (!props.session.current) {
+				socket.emit("sign-out", props.session.token);
 			} else {
 				socket.emit("sign-out");
 				Auth.signout();
 			}
-		},
+		};
+
+		return {
+			lastUse,
+			signOut,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Settings/Account.vue b/client/components/Settings/Account.vue
index 2485c7b1..68146c11 100644
--- a/client/components/Settings/Account.vue
+++ b/client/components/Settings/Account.vue
@@ -2,8 +2,8 @@
 	<div>
 		<div
 			v-if="
-				!$store.state.serverConfiguration.public &&
-				!$store.state.serverConfiguration.ldapEnabled
+				!store.state.serverConfiguration?.public &&
+				!store.state.serverConfiguration?.ldapEnabled
 			"
 			id="change-password"
 			role="group"
@@ -68,7 +68,7 @@
 			</div>
 		</div>
 
-		<div v-if="!$store.state.serverConfiguration.public" class="session-list" role="group">
+		<div v-if="!store.state.serverConfiguration?.public" class="session-list" role="group">
 			<h2>Sessions</h2>
 
 			<h3>Current session</h3>
@@ -84,7 +84,7 @@
 			</template>
 
 			<h3>Other sessions</h3>
-			<p v-if="$store.state.sessions.length === 0">Loading…</p>
+			<p v-if="store.state.sessions.length === 0">Loading…</p>
 			<p v-else-if="otherSessions.length === 0">
 				<em>You are not currently logged in to any other device.</em>
 			</p>
@@ -98,46 +98,59 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
 import socket from "../../js/socket";
 import RevealPassword from "../RevealPassword.vue";
 import Session from "../Session.vue";
+import {computed, defineComponent, onMounted, PropType, ref} from "vue";
+import {useStore} from "../../js/store";
 
-export default {
+export default defineComponent({
 	name: "UserSettings",
 	components: {
 		RevealPassword,
 		Session,
 	},
-	data() {
-		return {
-			passwordChangeStatus: null,
-			passwordErrors: {
-				missing_fields: "Please enter a new password",
-				password_mismatch: "Both new password fields must match",
-				password_incorrect:
-					"The current password field does not match your account password",
-				update_failed: "Failed to update your password",
-			},
+	props: {
+		settingsForm: {
+			type: Object as PropType<HTMLFormElement>,
+			required: true,
+		},
+	},
+	setup(props) {
+		const store = useStore();
+
+		const passwordErrors = {
+			missing_fields: "Please enter a new password",
+			password_mismatch: "Both new password fields must match",
+			password_incorrect: "The current password field does not match your account password",
+			update_failed: "Failed to update your password",
 		};
-	},
-	computed: {
-		currentSession() {
-			return this.$store.state.sessions.find((item) => item.current);
-		},
-		activeSessions() {
-			return this.$store.state.sessions.filter((item) => !item.current && item.active > 0);
-		},
-		otherSessions() {
-			return this.$store.state.sessions.filter((item) => !item.current && !item.active);
-		},
-	},
-	mounted() {
-		socket.emit("sessions:get");
-	},
-	methods: {
-		changePassword() {
-			const allFields = new FormData(this.$refs.settingsForm);
+
+		const passwordChangeStatus = ref<{
+			success: boolean;
+			error: keyof typeof passwordErrors;
+		}>();
+
+		const currentSession = computed(() => {
+			return store.state.sessions.find((item) => item.current);
+		});
+
+		const activeSessions = computed(() => {
+			return store.state.sessions.filter((item) => !item.current && item.active > 0);
+		});
+
+		const otherSessions = computed(() => {
+			return store.state.sessions.filter((item) => !item.current && !item.active);
+		});
+
+		onMounted(() => {
+			socket.emit("sessions:get");
+		});
+
+		const changePassword = () => {
+			const allFields = new FormData(props.settingsForm);
+
 			const data = {
 				old_password: allFields.get("old_password"),
 				new_password: allFields.get("new_password"),
@@ -145,7 +158,7 @@ export default {
 			};
 
 			if (!data.old_password || !data.new_password || !data.verify_password) {
-				this.passwordChangeStatus = {
+				passwordChangeStatus.value = {
 					success: false,
 					error: "missing_fields",
 				};
@@ -153,7 +166,7 @@ export default {
 			}
 
 			if (data.new_password !== data.verify_password) {
-				this.passwordChangeStatus = {
+				passwordChangeStatus.value = {
 					success: false,
 					error: "password_mismatch",
 				};
@@ -161,11 +174,22 @@ export default {
 			}
 
 			socket.once("change-password", (response) => {
-				this.passwordChangeStatus = response;
+				// TODO type
+				passwordChangeStatus.value = response as any;
 			});
 
 			socket.emit("change-password", data);
-		},
+		};
+
+		return {
+			store,
+			passwordChangeStatus,
+			passwordErrors,
+			currentSession,
+			activeSessions,
+			otherSessions,
+			changePassword,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Settings/Appearance.vue b/client/components/Settings/Appearance.vue
index ccb00de5..529c0272 100644
--- a/client/components/Settings/Appearance.vue
+++ b/client/components/Settings/Appearance.vue
@@ -3,14 +3,14 @@
 		<h2>Messages</h2>
 		<div>
 			<label class="opt">
-				<input :checked="$store.state.settings.motd" type="checkbox" name="motd" />
+				<input :checked="store.state.settings.motd" type="checkbox" name="motd" />
 				Show <abbr title="Message Of The Day">MOTD</abbr>
 			</label>
 		</div>
 		<div>
 			<label class="opt">
 				<input
-					:checked="$store.state.settings.showSeconds"
+					:checked="store.state.settings.showSeconds"
 					type="checkbox"
 					name="showSeconds"
 				/>
@@ -20,24 +20,24 @@
 		<div>
 			<label class="opt">
 				<input
-					:checked="$store.state.settings.use12hClock"
+					:checked="store.state.settings.use12hClock"
 					type="checkbox"
 					name="use12hClock"
 				/>
 				Use 12-hour timestamps
 			</label>
 		</div>
-		<template v-if="$store.state.serverConfiguration.prefetch">
+		<template v-if="store.state.serverConfiguration?.prefetch">
 			<h2>Link previews</h2>
 			<div>
 				<label class="opt">
-					<input :checked="$store.state.settings.media" type="checkbox" name="media" />
+					<input :checked="store.state.settings.media" type="checkbox" name="media" />
 					Auto-expand media
 				</label>
 			</div>
 			<div>
 				<label class="opt">
-					<input :checked="$store.state.settings.links" type="checkbox" name="links" />
+					<input :checked="store.state.settings.links" type="checkbox" name="links" />
 					Auto-expand websites
 				</label>
 			</div>
@@ -54,7 +54,7 @@
 		<div role="group" aria-labelledby="label-status-messages">
 			<label class="opt">
 				<input
-					:checked="$store.state.settings.statusMessages === 'shown'"
+					:checked="store.state.settings.statusMessages === 'shown'"
 					type="radio"
 					name="statusMessages"
 					value="shown"
@@ -63,7 +63,7 @@
 			</label>
 			<label class="opt">
 				<input
-					:checked="$store.state.settings.statusMessages === 'condensed'"
+					:checked="store.state.settings.statusMessages === 'condensed'"
 					type="radio"
 					name="statusMessages"
 					value="condensed"
@@ -72,7 +72,7 @@
 			</label>
 			<label class="opt">
 				<input
-					:checked="$store.state.settings.statusMessages === 'hidden'"
+					:checked="store.state.settings.statusMessages === 'hidden'"
 					type="radio"
 					name="statusMessages"
 					value="hidden"
@@ -84,7 +84,7 @@
 		<div>
 			<label class="opt">
 				<input
-					:checked="$store.state.settings.coloredNicks"
+					:checked="store.state.settings.coloredNicks"
 					type="checkbox"
 					name="coloredNicks"
 				/>
@@ -92,7 +92,7 @@
 			</label>
 			<label class="opt">
 				<input
-					:checked="$store.state.settings.autocomplete"
+					:checked="store.state.settings.autocomplete"
 					type="checkbox"
 					name="autocomplete"
 				/>
@@ -112,7 +112,7 @@
 				</label>
 				<input
 					id="nickPostfix"
-					:value="$store.state.settings.nickPostfix"
+					:value="store.state.settings.nickPostfix"
 					type="text"
 					name="nickPostfix"
 					class="input"
@@ -126,12 +126,12 @@
 			<label for="theme-select" class="sr-only">Theme</label>
 			<select
 				id="theme-select"
-				:value="$store.state.settings.theme"
+				:value="store.state.settings.theme"
 				name="theme"
 				class="input"
 			>
 				<option
-					v-for="theme in $store.state.serverConfiguration.themes"
+					v-for="theme in store.state.serverConfiguration?.themes"
 					:key="theme.name"
 					:value="theme.name"
 				>
@@ -147,7 +147,7 @@
 			</label>
 			<textarea
 				id="user-specified-css-input"
-				:value="$store.state.settings.userStyles"
+				:value="store.state.settings.userStyles"
 				class="input"
 				name="userStyles"
 				placeholder="/* You can override any style with CSS here */"
@@ -162,8 +162,18 @@ textarea#user-specified-css-input {
 }
 </style>
 
-<script>
-export default {
+<script lang="ts">
+import {defineComponent} from "vue";
+import {useStore} from "../../js/store";
+
+export default defineComponent({
 	name: "AppearanceSettings",
-};
+	setup() {
+		const store = useStore();
+
+		return {
+			store,
+		};
+	},
+});
 </script>
diff --git a/client/components/Settings/General.vue b/client/components/Settings/General.vue
index 1941ddb1..9482554a 100644
--- a/client/components/Settings/General.vue
+++ b/client/components/Settings/General.vue
@@ -19,12 +19,12 @@
 				Open irc:// URLs with The Lounge
 			</button>
 		</div>
-		<div v-if="$store.state.serverConfiguration.fileUpload">
+		<div v-if="store.state.serverConfiguration?.fileUpload">
 			<h2>File uploads</h2>
 			<div>
 				<label class="opt">
 					<input
-						:checked="$store.state.settings.uploadCanvas"
+						:checked="store.state.settings.uploadCanvas"
 						type="checkbox"
 						name="uploadCanvas"
 					/>
@@ -39,18 +39,18 @@
 				</label>
 			</div>
 		</div>
-		<div v-if="!$store.state.serverConfiguration.public">
+		<div v-if="!store.state.serverConfiguration?.public">
 			<h2>Settings synchronisation</h2>
 			<label class="opt">
 				<input
-					:checked="$store.state.settings.syncSettings"
+					:checked="store.state.settings.syncSettings"
 					type="checkbox"
 					name="syncSettings"
 				/>
 				Synchronize settings with other clients
 			</label>
-			<template v-if="!$store.state.settings.syncSettings">
-				<div v-if="$store.state.serverHasSettings" class="settings-sync-panel">
+			<template v-if="!store.state.settings.syncSettings">
+				<div v-if="store.state.serverHasSettings" class="settings-sync-panel">
 					<p>
 						<strong>Warning:</strong> Checking this box will override the settings of
 						this client with those stored on the server.
@@ -71,14 +71,14 @@
 				</div>
 			</template>
 		</div>
-		<div v-if="!$store.state.serverConfiguration.public">
+		<div v-if="!store.state.serverConfiguration?.public">
 			<h2>Automatic away message</h2>
 
 			<label class="opt">
 				<label for="awayMessage" class="sr-only">Automatic away message</label>
 				<input
 					id="awayMessage"
-					:value="$store.state.settings.awayMessage"
+					:value="store.state.settings.awayMessage"
 					type="text"
 					name="awayMessage"
 					class="input"
@@ -91,53 +91,85 @@
 
 <style></style>
 
-<script>
-let installPromptEvent = null;
+<script lang="ts">
+import {computed, defineComponent, onMounted, ref} from "vue";
+import {useStore} from "../../js/store";
+import {BeforeInstallPromptEvent} from "../../js/types";
+
+let installPromptEvent: BeforeInstallPromptEvent | null = null;
 
 window.addEventListener("beforeinstallprompt", (e) => {
 	e.preventDefault();
-	installPromptEvent = e;
+	installPromptEvent = e as BeforeInstallPromptEvent;
 });
 
-export default {
+export default defineComponent({
 	name: "GeneralSettings",
-	data() {
-		return {
-			canRegisterProtocol: false,
-		};
-	},
-	computed: {
-		hasInstallPromptEvent() {
+	setup() {
+		const store = useStore();
+		const canRegisterProtocol = ref(false);
+
+		const hasInstallPromptEvent = computed(() => {
 			// TODO: This doesn't hide the button after clicking
 			return installPromptEvent !== null;
-		},
-	},
-	mounted() {
-		// Enable protocol handler registration if supported,
-		// and the network configuration is not locked
-		this.canRegisterProtocol =
-			window.navigator.registerProtocolHandler &&
-			!this.$store.state.serverConfiguration.lockNetwork;
-	},
-	methods: {
-		nativeInstallPrompt() {
-			installPromptEvent.prompt();
-			installPromptEvent = null;
-		},
-		onForceSyncClick() {
-			this.$store.dispatch("settings/syncAll", true);
-			this.$store.dispatch("settings/update", {
-				name: "syncSettings",
-				value: true,
-				sync: true,
-			});
-		},
-		registerProtocol() {
-			const uri = document.location.origin + document.location.pathname + "?uri=%s";
+		});
 
+		onMounted(() => {
+			// Enable protocol handler registration if supported,
+			// and the network configuration is not locked
+			canRegisterProtocol.value =
+				!!window.navigator.registerProtocolHandler &&
+				!store.state.serverConfiguration?.lockNetwork;
+		});
+
+		const nativeInstallPrompt = () => {
+			if (!installPromptEvent) {
+				return;
+			}
+
+			installPromptEvent.prompt().catch((e) => {
+				// eslint-disable-next-line no-console
+				console.error(e);
+			});
+
+			installPromptEvent = null;
+		};
+
+		const onForceSyncClick = () => {
+			store.dispatch("settings/syncAll", true).catch((e) => {
+				// eslint-disable-next-line no-console
+				console.error(e);
+			});
+
+			store
+				.dispatch("settings/update", {
+					name: "syncSettings",
+					value: true,
+					sync: true,
+				})
+				.catch((e) => {
+					// eslint-disable-next-line no-console
+					console.error(e);
+				});
+		};
+
+		const registerProtocol = () => {
+			const uri = document.location.origin + document.location.pathname + "?uri=%s";
+			// @ts-expect-error
+			// the third argument is deprecated but recommended for compatibility: https://developer.mozilla.org/en-US/docs/Web/API/Navigator/registerProtocolHandler
 			window.navigator.registerProtocolHandler("irc", uri, "The Lounge");
+			// @ts-expect-error
 			window.navigator.registerProtocolHandler("ircs", uri, "The Lounge");
-		},
+		};
+
+		return {
+			store,
+			canRegisterProtocol,
+			hasInstallPromptEvent,
+			nativeInstallPrompt,
+			onForceSyncClick,
+			registerProtocol,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Settings/Navigation.vue b/client/components/Settings/Navigation.vue
index 302fe581..1b8c5f39 100644
--- a/client/components/Settings/Navigation.vue
+++ b/client/components/Settings/Navigation.vue
@@ -90,13 +90,14 @@
 }
 </style>
 
-<script>
+<script lang="ts">
 import SettingTabItem from "./SettingTabItem.vue";
+import {defineComponent} from "vue";
 
-export default {
+export default defineComponent({
 	name: "SettingsTabs",
 	components: {
 		SettingTabItem,
 	},
-};
+});
 </script>
diff --git a/client/components/Settings/Notifications.vue b/client/components/Settings/Notifications.vue
index 218781ac..9d9c9695 100644
--- a/client/components/Settings/Notifications.vue
+++ b/client/components/Settings/Notifications.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<template v-if="!$store.state.serverConfiguration.public">
+		<template v-if="!store.state.serverConfiguration?.public">
 			<h2>Push Notifications</h2>
 			<div>
 				<button
@@ -8,24 +8,24 @@
 					type="button"
 					class="btn"
 					:disabled="
-						$store.state.pushNotificationState !== 'supported' &&
-						$store.state.pushNotificationState !== 'subscribed'
+						store.state.pushNotificationState !== 'supported' &&
+						store.state.pushNotificationState !== 'subscribed'
 					"
 					@click="onPushButtonClick"
 				>
-					<template v-if="$store.state.pushNotificationState === 'subscribed'">
+					<template v-if="store.state.pushNotificationState === 'subscribed'">
 						Unsubscribe from push notifications
 					</template>
-					<template v-else-if="$store.state.pushNotificationState === 'loading'">
+					<template v-else-if="store.state.pushNotificationState === 'loading'">
 						Loading…
 					</template>
 					<template v-else> Subscribe to push notifications </template>
 				</button>
-				<div v-if="$store.state.pushNotificationState === 'nohttps'" class="error">
+				<div v-if="store.state.pushNotificationState === 'nohttps'" class="error">
 					<strong>Warning</strong>: Push notifications are only supported over HTTPS
 					connections.
 				</div>
-				<div v-if="$store.state.pushNotificationState === 'unsupported'" class="error">
+				<div v-if="store.state.pushNotificationState === 'unsupported'" class="error">
 					<strong>Warning</strong>:
 					<span>Push notifications are not supported by your browser.</span>
 
@@ -48,17 +48,17 @@
 			<label class="opt">
 				<input
 					id="desktopNotifications"
-					:checked="$store.state.settings.desktopNotifications"
-					:disabled="$store.state.desktopNotificationState === 'nohttps'"
+					:checked="store.state.settings.desktopNotifications"
+					:disabled="store.state.desktopNotificationState === 'nohttps'"
 					type="checkbox"
 					name="desktopNotifications"
 				/>
 				Enable browser notifications<br />
-				<div v-if="$store.state.desktopNotificationState === 'unsupported'" class="error">
+				<div v-if="store.state.desktopNotificationState === 'unsupported'" class="error">
 					<strong>Warning</strong>: Notifications are not supported by your browser.
 				</div>
 				<div
-					v-if="$store.state.desktopNotificationState === 'nohttps'"
+					v-if="store.state.desktopNotificationState === 'nohttps'"
 					id="warnBlockedDesktopNotifications"
 					class="error"
 				>
@@ -66,7 +66,7 @@
 					connections.
 				</div>
 				<div
-					v-if="$store.state.desktopNotificationState === 'blocked'"
+					v-if="store.state.desktopNotificationState === 'blocked'"
 					id="warnBlockedDesktopNotifications"
 					class="error"
 				>
@@ -77,7 +77,7 @@
 		<div>
 			<label class="opt">
 				<input
-					:checked="$store.state.settings.notification"
+					:checked="store.state.settings.notification"
 					type="checkbox"
 					name="notification"
 				/>
@@ -93,7 +93,7 @@
 		<div>
 			<label class="opt">
 				<input
-					:checked="$store.state.settings.notifyAllMessages"
+					:checked="store.state.settings.notifyAllMessages"
 					type="checkbox"
 					name="notifyAllMessages"
 				/>
@@ -101,7 +101,7 @@
 			</label>
 		</div>
 
-		<div v-if="!$store.state.serverConfiguration.public">
+		<div v-if="!store.state.serverConfiguration?.public">
 			<label class="opt">
 				<label for="highlights" class="opt">
 					Custom highlights
@@ -115,7 +115,7 @@ expressions, it will trigger a highlight."
 				</label>
 				<input
 					id="highlights"
-					:value="$store.state.settings.highlights"
+					:value="store.state.settings.highlights"
 					type="text"
 					name="highlights"
 					class="input"
@@ -125,7 +125,7 @@ expressions, it will trigger a highlight."
 			</label>
 		</div>
 
-		<div v-if="!$store.state.serverConfiguration.public">
+		<div v-if="!store.state.serverConfiguration?.public">
 			<label class="opt">
 				<label for="highlightExceptions" class="opt">
 					Highlight exceptions
@@ -140,7 +140,7 @@ your nickname or expressions defined in custom highlights."
 				</label>
 				<input
 					id="highlightExceptions"
-					:value="$store.state.settings.highlightExceptions"
+					:value="store.state.settings.highlightExceptions"
 					type="text"
 					name="highlightExceptions"
 					class="input"
@@ -152,15 +152,18 @@ your nickname or expressions defined in custom highlights."
 	</div>
 </template>
 
-<script>
+<script lang="ts">
+import {computed, defineComponent} from "vue";
+import {useStore} from "../../js/store";
 import webpush from "../../js/webpush";
 
-export default {
+export default defineComponent({
 	name: "NotificationSettings",
-	data() {
-		return {
-			// https://stackoverflow.com/questions/9038625/detect-if-device-is-ios
-			isIOS: () =>
+	setup() {
+		const store = useStore();
+
+		const isIOS = computed(
+			() =>
 				[
 					"iPad Simulator",
 					"iPhone Simulator",
@@ -170,18 +173,27 @@ export default {
 					"iPod",
 				].includes(navigator.platform) ||
 				// iPad on iOS 13 detection
-				(navigator.userAgent.includes("Mac") && "ontouchend" in document),
-		};
-	},
-	methods: {
-		playNotification() {
+				(navigator.userAgent.includes("Mac") && "ontouchend" in document)
+		);
+
+		const playNotification = () => {
 			const pop = new Audio();
 			pop.src = "audio/pop.wav";
+
+			// eslint-disable-next-line
 			pop.play();
-		},
-		onPushButtonClick() {
+		};
+
+		const onPushButtonClick = () => {
 			webpush.togglePushSubscription();
-		},
+		};
+
+		return {
+			isIOS,
+			store,
+			playNotification,
+			onPushButtonClick,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Settings/SettingTabItem.vue b/client/components/Settings/SettingTabItem.vue
index 7f32574e..6512db61 100644
--- a/client/components/Settings/SettingTabItem.vue
+++ b/client/components/Settings/SettingTabItem.vue
@@ -1,24 +1,22 @@
 <template>
-	<li :aria-label="name">
-		<router-link
-			v-slot:default="{navigate, isExactActive}"
-			:to="'/settings/' + to"
-			:class="['icon', className]"
-			:aria-label="name"
-			role="tab"
-			aria-controls="settings"
-			:aria-selected="$route.name === name"
-			custom
-		>
-			<button :class="{active: isExactActive}" @click="navigate" @keypress.enter="navigate">
+	<li :aria-label="name" role="tab" :aria-selected="route.name === name" aria-controls="settings">
+		<router-link v-slot:default="{navigate, isExactActive}" :to="'/settings/' + to" custom>
+			<button
+				:class="['icon', className, {active: isExactActive}]"
+				@click="navigate"
+				@keypress.enter="navigate"
+			>
 				{{ name }}
 			</button>
 		</router-link>
 	</li>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import {defineComponent} from "vue";
+import {useRoute} from "vue-router";
+
+export default defineComponent({
 	name: "SettingTabListItem",
 	props: {
 		name: {
@@ -34,5 +32,12 @@ export default {
 			required: true,
 		},
 	},
-};
+	setup() {
+		const route = useRoute();
+
+		return {
+			route,
+		};
+	},
+});
 </script>
diff --git a/client/components/Sidebar.vue b/client/components/Sidebar.vue
index c6b4d833..787c7400 100644
--- a/client/components/Sidebar.vue
+++ b/client/components/Sidebar.vue
@@ -34,172 +34,234 @@
 				class="tooltipped tooltipped-n tooltipped-no-touch"
 				aria-label="Connect to network"
 				><router-link
+					v-slot:default="{navigate, isActive}"
 					to="/connect"
-					tag="button"
-					active-class="active"
-					:class="['icon', 'connect']"
-					aria-label="Connect to network"
 					role="tab"
 					aria-controls="connect"
-					:aria-selected="$route.name === 'Connect'"
-			/></span>
+				>
+					<button
+						:class="['icon', 'connect', {active: isActive}]"
+						:aria-selected="isActive"
+						@click="navigate"
+						@keypress.enter="navigate"
+					/> </router-link
+			></span>
 			<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Settings"
 				><router-link
+					v-slot:default="{navigate, isActive}"
 					to="/settings"
-					tag="button"
-					active-class="active"
-					:class="['icon', 'settings']"
-					aria-label="Settings"
 					role="tab"
 					aria-controls="settings"
-					:aria-selected="$route.name === 'General'"
-			/></span>
+				>
+					<button
+						:class="['icon', 'settings', {active: isActive}]"
+						:aria-selected="isActive"
+						@click="navigate"
+						@keypress.enter="navigate"
+					></button> </router-link
+			></span>
 			<span
 				class="tooltipped tooltipped-n tooltipped-no-touch"
 				:aria-label="
-					$store.state.serverConfiguration.isUpdateAvailable
+					store.state.serverConfiguration?.isUpdateAvailable
 						? 'Help\n(update available)'
 						: 'Help'
 				"
 				><router-link
+					v-slot:default="{navigate, isActive}"
 					to="/help"
-					tag="button"
-					active-class="active"
-					:class="[
-						'icon',
-						'help',
-						{notified: $store.state.serverConfiguration.isUpdateAvailable},
-					]"
-					aria-label="Help"
 					role="tab"
 					aria-controls="help"
-					:aria-selected="$route.name === 'Help'"
-			/></span>
+				>
+					<button
+						:aria-selected="route.name === 'Help'"
+						:class="[
+							'icon',
+							'help',
+							{notified: store.state.serverConfiguration?.isUpdateAvailable},
+							{active: isActive},
+						]"
+						@click="navigate"
+						@keypress.enter="navigate"
+					></button> </router-link
+			></span>
 		</footer>
 	</aside>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, onMounted, onUnmounted, PropType, ref} from "vue";
+import {useRoute} from "vue-router";
+import {useStore} from "../js/store";
 import NetworkList from "./NetworkList.vue";
 
-export default {
+export default defineComponent({
 	name: "Sidebar",
 	components: {
 		NetworkList,
 	},
 	props: {
-		overlay: HTMLElement,
+		overlay: {type: Object as PropType<HTMLElement | null>, required: true},
 	},
-	data() {
-		return {
-			isDevelopment: process.env.NODE_ENV !== "production",
+	setup(props) {
+		const isDevelopment = process.env.NODE_ENV !== "production";
+
+		const store = useStore();
+		const route = useRoute();
+
+		const touchStartPos = ref<Touch | null>();
+		const touchCurPos = ref<Touch | null>();
+		const touchStartTime = ref<number>(0);
+		const menuWidth = ref<number>(0);
+		const menuIsMoving = ref<boolean>(false);
+		const menuIsAbsolute = ref<boolean>(false);
+
+		const sidebar = ref<HTMLElement | null>(null);
+
+		const toggle = (state: boolean) => {
+			store.commit("sidebarOpen", state);
 		};
-	},
-	mounted() {
-		this.touchStartPos = null;
-		this.touchCurPos = null;
-		this.touchStartTime = 0;
-		this.menuWidth = 0;
-		this.menuIsMoving = false;
-		this.menuIsAbsolute = false;
 
-		this.onTouchStart = (e) => {
-			this.touchStartPos = this.touchCurPos = e.touches.item(0);
+		const onTouchMove = (e: TouchEvent) => {
+			const touch = (touchCurPos.value = e.touches.item(0));
 
-			if (e.touches.length !== 1) {
-				this.onTouchEnd();
+			if (
+				!touch ||
+				!touchStartPos.value ||
+				!touchStartPos.value.screenX ||
+				!touchStartPos.value.screenY
+			) {
 				return;
 			}
 
-			const styles = window.getComputedStyle(this.$refs.sidebar);
+			let distX = touch.screenX - touchStartPos.value.screenX;
+			const distY = touch.screenY - touchStartPos.value.screenY;
 
-			this.menuWidth = parseFloat(styles.width);
-			this.menuIsAbsolute = styles.position === "absolute";
-
-			if (!this.$store.state.sidebarOpen || this.touchStartPos.screenX > this.menuWidth) {
-				this.touchStartTime = Date.now();
-
-				document.body.addEventListener("touchmove", this.onTouchMove, {passive: true});
-				document.body.addEventListener("touchend", this.onTouchEnd, {passive: true});
-			}
-		};
-
-		this.onTouchMove = (e) => {
-			const touch = (this.touchCurPos = e.touches.item(0));
-			let distX = touch.screenX - this.touchStartPos.screenX;
-			const distY = touch.screenY - this.touchStartPos.screenY;
-
-			if (!this.menuIsMoving) {
+			if (!menuIsMoving.value) {
 				// tan(45°) is 1. Gestures in 0°-45° (< 1) are considered horizontal, so
 				// menu must be open; gestures in 45°-90° (>1) are considered vertical, so
 				// chat windows must be scrolled.
 				if (Math.abs(distY / distX) >= 1) {
-					this.onTouchEnd();
+					// eslint-disable-next-line no-use-before-define
+					onTouchEnd();
 					return;
 				}
 
 				const devicePixelRatio = window.devicePixelRatio || 2;
 
 				if (Math.abs(distX) > devicePixelRatio) {
-					this.$store.commit("sidebarDragging", true);
-					this.menuIsMoving = true;
+					store.commit("sidebarDragging", true);
+					menuIsMoving.value = true;
 				}
 			}
 
 			// Do not animate the menu on desktop view
-			if (!this.menuIsAbsolute) {
+			if (!menuIsAbsolute.value) {
 				return;
 			}
 
-			if (this.$store.state.sidebarOpen) {
-				distX += this.menuWidth;
+			if (store.state.sidebarOpen) {
+				distX += menuWidth.value;
 			}
 
-			if (distX > this.menuWidth) {
-				distX = this.menuWidth;
+			if (distX > menuWidth.value) {
+				distX = menuWidth.value;
 			} else if (distX < 0) {
 				distX = 0;
 			}
 
-			this.$refs.sidebar.style.transform = "translate3d(" + distX + "px, 0, 0)";
-			this.overlay.style.opacity = distX / this.menuWidth;
+			if (sidebar.value) {
+				sidebar.value.style.transform = "translate3d(" + distX.toString() + "px, 0, 0)";
+			}
+
+			if (props.overlay) {
+				props.overlay.style.opacity = `${distX / menuWidth.value}`;
+			}
 		};
 
-		this.onTouchEnd = () => {
-			const diff = this.touchCurPos.screenX - this.touchStartPos.screenX;
+		const onTouchEnd = () => {
+			if (!touchStartPos.value?.screenX || !touchCurPos.value?.screenX) {
+				return;
+			}
+
+			const diff = touchCurPos.value.screenX - touchStartPos.value.screenX;
 			const absDiff = Math.abs(diff);
 
 			if (
-				absDiff > this.menuWidth / 2 ||
-				(Date.now() - this.touchStartTime < 180 && absDiff > 50)
+				absDiff > menuWidth.value / 2 ||
+				(Date.now() - touchStartTime.value < 180 && absDiff > 50)
 			) {
-				this.toggle(diff > 0);
+				toggle(diff > 0);
 			}
 
-			document.body.removeEventListener("touchmove", this.onTouchMove);
-			document.body.removeEventListener("touchend", this.onTouchEnd);
-			this.$store.commit("sidebarDragging", false);
+			document.body.removeEventListener("touchmove", onTouchMove);
+			document.body.removeEventListener("touchend", onTouchEnd);
 
-			this.$refs.sidebar.style.transform = null;
-			this.overlay.style.opacity = null;
+			store.commit("sidebarDragging", false);
 
-			this.touchStartPos = null;
-			this.touchCurPos = null;
-			this.touchStartTime = 0;
-			this.menuIsMoving = false;
+			if (sidebar.value) {
+				sidebar.value.style.transform = "";
+			}
+
+			if (props.overlay) {
+				props.overlay.style.opacity = "";
+			}
+
+			touchStartPos.value = null;
+			touchCurPos.value = null;
+			touchStartTime.value = 0;
+			menuIsMoving.value = false;
 		};
 
-		this.toggle = (state) => {
-			this.$store.commit("sidebarOpen", state);
+		const onTouchStart = (e: TouchEvent) => {
+			if (!sidebar.value) {
+				return;
+			}
+
+			touchStartPos.value = touchCurPos.value = e.touches.item(0);
+
+			if (e.touches.length !== 1) {
+				onTouchEnd();
+				return;
+			}
+
+			const styles = window.getComputedStyle(sidebar.value);
+
+			menuWidth.value = parseFloat(styles.width);
+			menuIsAbsolute.value = styles.position === "absolute";
+
+			if (
+				!store.state.sidebarOpen ||
+				(touchStartPos.value?.screenX && touchStartPos.value.screenX > menuWidth.value)
+			) {
+				touchStartTime.value = Date.now();
+
+				document.body.addEventListener("touchmove", onTouchMove, {passive: true});
+				document.body.addEventListener("touchend", onTouchEnd, {passive: true});
+			}
 		};
 
-		document.body.addEventListener("touchstart", this.onTouchStart, {passive: true});
+		onMounted(() => {
+			document.body.addEventListener("touchstart", onTouchStart, {passive: true});
+		});
+
+		onUnmounted(() => {
+			document.body.removeEventListener("touchstart", onTouchStart);
+		});
+
+		const isPublic = () => document.body.classList.contains("public");
+
+		return {
+			isDevelopment,
+			store,
+			route,
+			sidebar,
+			toggle,
+			onTouchStart,
+			onTouchMove,
+			onTouchEnd,
+			isPublic,
+		};
 	},
-	destroyed() {
-		document.body.removeEventListener("touchstart", this.onTouchStart, {passive: true});
-	},
-	methods: {
-		isPublic: () => document.body.classList.contains("public"),
-	},
-};
+});
 </script>
diff --git a/client/components/SidebarToggle.vue b/client/components/SidebarToggle.vue
index 6e0a7319..c260cac7 100644
--- a/client/components/SidebarToggle.vue
+++ b/client/components/SidebarToggle.vue
@@ -1,9 +1,19 @@
 <template>
-	<button class="lt" aria-label="Toggle channel list" @click="$store.commit('toggleSidebar')" />
+	<button class="lt" aria-label="Toggle channel list" @click="store.commit('toggleSidebar')" />
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import {defineComponent} from "vue";
+import {useStore} from "../js/store";
+
+export default defineComponent({
 	name: "SidebarToggle",
-};
+	setup() {
+		const store = useStore();
+
+		return {
+			store,
+		};
+	},
+});
 </script>
diff --git a/client/components/Special/ListBans.vue b/client/components/Special/ListBans.vue
index 781be944..b9c6a528 100644
--- a/client/components/Special/ListBans.vue
+++ b/client/components/Special/ListBans.vue
@@ -17,23 +17,29 @@
 	</table>
 </template>
 
-<script>
+<script lang="ts">
 import ParsedMessage from "../ParsedMessage.vue";
-import localetime from "../../js/helpers/localetime";
+import localeTime from "../../js/helpers/localetime";
+import {defineComponent, PropType} from "vue";
+import type {ClientNetwork, ClientChan} from "../../js/types";
 
-export default {
+export default defineComponent({
 	name: "ListBans",
 	components: {
 		ParsedMessage,
 	},
 	props: {
-		network: Object,
-		channel: Object,
+		network: {type: Object as PropType<ClientNetwork>, required: true},
+		channel: {type: Object as PropType<ClientChan>, required: true},
 	},
-	methods: {
-		localetime(date) {
-			return localetime(date);
-		},
+	setup() {
+		const localetime = (date: number | Date) => {
+			return localeTime(date);
+		};
+
+		return {
+			localetime,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Special/ListChannels.vue b/client/components/Special/ListChannels.vue
index bc415346..fcc188e9 100644
--- a/client/components/Special/ListChannels.vue
+++ b/client/components/Special/ListChannels.vue
@@ -18,17 +18,19 @@
 	</table>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, PropType} from "vue";
+import {ClientChan, ClientNetwork} from "../../js/types";
 import ParsedMessage from "../ParsedMessage.vue";
 
-export default {
+export default defineComponent({
 	name: "ListChannels",
 	components: {
 		ParsedMessage,
 	},
 	props: {
-		network: Object,
-		channel: Object,
+		network: {type: Object as PropType<ClientNetwork>, required: true},
+		channel: {type: Object as PropType<ClientChan>, required: true},
 	},
-};
+});
 </script>
diff --git a/client/components/Special/ListIgnored.vue b/client/components/Special/ListIgnored.vue
index be672266..4ea399de 100644
--- a/client/components/Special/ListIgnored.vue
+++ b/client/components/Special/ListIgnored.vue
@@ -15,23 +15,25 @@
 	</table>
 </template>
 
-<script>
+<script lang="ts">
 import ParsedMessage from "../ParsedMessage.vue";
 import localetime from "../../js/helpers/localetime";
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientChan} from "../../js/types";
 
-export default {
+export default defineComponent({
 	name: "ListIgnored",
 	components: {
 		ParsedMessage,
 	},
 	props: {
-		network: Object,
-		channel: Object,
+		network: {type: Object as PropType<ClientNetwork>, required: true},
+		channel: {type: Object as PropType<ClientChan>, required: true},
 	},
-	methods: {
-		localetime(date) {
-			return localetime(date);
-		},
+	setup() {
+		return {
+			localetime,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Special/ListInvites.vue b/client/components/Special/ListInvites.vue
index 9f59645e..c04a83a5 100644
--- a/client/components/Special/ListInvites.vue
+++ b/client/components/Special/ListInvites.vue
@@ -19,23 +19,25 @@
 	</table>
 </template>
 
-<script>
+<script lang="ts">
 import ParsedMessage from "../ParsedMessage.vue";
 import localetime from "../../js/helpers/localetime";
+import {defineComponent, PropType} from "vue";
+import {ClientNetwork, ClientChan} from "../../js/types";
 
-export default {
+export default defineComponent({
 	name: "ListInvites",
 	components: {
 		ParsedMessage,
 	},
 	props: {
-		network: Object,
-		channel: Object,
+		network: {type: Object as PropType<ClientNetwork>, required: true},
+		channel: {type: Object as PropType<ClientChan>, required: true},
 	},
-	methods: {
-		localetime(date) {
-			return localetime(date);
-		},
+	setup() {
+		return {
+			localetime: (date: Date) => localetime(date),
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Username.vue b/client/components/Username.vue
index 92ebb60f..371e89a5 100644
--- a/client/components/Username.vue
+++ b/client/components/Username.vue
@@ -10,44 +10,71 @@
 	>
 </template>
 
-<script>
+<script lang="ts">
+import {computed, defineComponent, PropType} from "vue";
+import {UserInMessage} from "../../server/models/msg";
 import eventbus from "../js/eventbus";
 import colorClass from "../js/helpers/colorClass";
+import type {ClientChan, ClientNetwork, ClientUser} from "../js/types";
 
-export default {
+type UsernameUser = Partial<UserInMessage> & {
+	mode?: string;
+	nick: string;
+};
+
+export default defineComponent({
 	name: "Username",
 	props: {
-		user: Object,
+		user: {
+			// TODO: UserInMessage shouldn't be necessary here.
+			type: Object as PropType<UsernameUser | UserInMessage>,
+			required: true,
+		},
 		active: Boolean,
-		onHover: Function,
-		channel: Object,
-		network: Object,
+		onHover: {
+			type: Function as PropType<(user: UserInMessage) => void>,
+			required: false,
+		},
+		channel: {type: Object as PropType<ClientChan>, required: false},
+		network: {type: Object as PropType<ClientNetwork>, required: false},
 	},
-	computed: {
-		mode() {
+	setup(props) {
+		const mode = computed(() => {
 			// Message objects have a singular mode, but user objects have modes array
-			if (this.user.modes) {
-				return this.user.modes[0];
+			if (props.user.modes) {
+				return props.user.modes[0];
 			}
 
-			return this.user.mode;
-		},
-		nickColor() {
-			return colorClass(this.user.nick);
-		},
-	},
-	methods: {
-		hover() {
-			return this.onHover(this.user);
-		},
-		openContextMenu(event) {
+			return props.user.mode;
+		});
+
+		// TODO: Nick must be ! because our user prop union includes UserInMessage
+		const nickColor = computed(() => colorClass(props.user.nick!));
+
+		const hover = () => {
+			if (props.onHover) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+				return props.onHover(props.user as UserInMessage);
+			}
+
+			return null;
+		};
+
+		const openContextMenu = (event: Event) => {
 			eventbus.emit("contextmenu:user", {
 				event: event,
-				user: this.user,
-				network: this.network,
-				channel: this.channel,
+				user: props.user,
+				network: props.network,
+				channel: props.channel,
 			});
-		},
+		};
+
+		return {
+			mode,
+			nickColor,
+			hover,
+			openContextMenu,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/VersionChecker.vue b/client/components/VersionChecker.vue
index 129861a8..3070924d 100644
--- a/client/components/VersionChecker.vue
+++ b/client/components/VersionChecker.vue
@@ -1,25 +1,25 @@
 <template>
-	<div id="version-checker" :class="[$store.state.versionStatus]">
-		<p v-if="$store.state.versionStatus === 'loading'">Checking for updates…</p>
-		<p v-if="$store.state.versionStatus === 'new-version'">
-			The Lounge <b>{{ $store.state.versionData.latest.version }}</b>
-			<template v-if="$store.state.versionData.latest.prerelease"> (pre-release) </template>
+	<div id="version-checker" :class="[store.state.versionStatus]">
+		<p v-if="store.state.versionStatus === 'loading'">Checking for updates…</p>
+		<p v-if="store.state.versionStatus === 'new-version'">
+			The Lounge <b>{{ store.state.versionData?.latest.version }}</b>
+			<template v-if="store.state.versionData?.latest.prerelease"> (pre-release) </template>
 			is now available.
 			<br />
 
-			<a :href="$store.state.versionData.latest.url" target="_blank" rel="noopener">
+			<a :href="store.state.versionData?.latest.url" target="_blank" rel="noopener">
 				Read more on GitHub
 			</a>
 		</p>
-		<p v-if="$store.state.versionStatus === 'new-packages'">
+		<p v-if="store.state.versionStatus === 'new-packages'">
 			The Lounge is up to date, but there are out of date packages Run
 			<code>thelounge upgrade</code> on the server to upgrade packages.
 		</p>
-		<template v-if="$store.state.versionStatus === 'up-to-date'">
+		<template v-if="store.state.versionStatus === 'up-to-date'">
 			<p>The Lounge is up to date!</p>
 
 			<button
-				v-if="$store.state.versionDataExpired"
+				v-if="store.state.versionDataExpired"
 				id="check-now"
 				class="btn btn-small"
 				@click="checkNow"
@@ -27,7 +27,7 @@
 				Check now
 			</button>
 		</template>
-		<template v-if="$store.state.versionStatus === 'error'">
+		<template v-if="store.state.versionStatus === 'error'">
 			<p>Information about latest release could not be retrieved.</p>
 
 			<button id="check-now" class="btn btn-small" @click="checkNow">Try again</button>
@@ -35,22 +35,32 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, onMounted} from "vue";
 import socket from "../js/socket";
+import {useStore} from "../js/store";
 
-export default {
+export default defineComponent({
 	name: "VersionChecker",
-	mounted() {
-		if (!this.$store.state.versionData) {
-			this.checkNow();
-		}
-	},
-	methods: {
-		checkNow() {
-			this.$store.commit("versionData", null);
-			this.$store.commit("versionStatus", "loading");
+	setup() {
+		const store = useStore();
+
+		const checkNow = () => {
+			store.commit("versionData", null);
+			store.commit("versionStatus", "loading");
 			socket.emit("changelog");
-		},
+		};
+
+		onMounted(() => {
+			if (!store.state.versionData) {
+				checkNow();
+			}
+		});
+
+		return {
+			store,
+			checkNow,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Windows/Changelog.vue b/client/components/Windows/Changelog.vue
index 32fbc708..4515e6b5 100644
--- a/client/components/Windows/Changelog.vue
+++ b/client/components/Windows/Changelog.vue
@@ -7,29 +7,26 @@
 			<router-link id="back-to-help" to="/help">« Help</router-link>
 
 			<template
-				v-if="
-					$store.state.versionData &&
-					$store.state.versionData.current &&
-					$store.state.versionData.current.version
-				"
+				v-if="store.state.versionData?.current && store.state.versionData?.current.version"
 			>
 				<h1 class="title">
-					Release notes for {{ $store.state.versionData.current.version }}
+					Release notes for {{ store.state.versionData.current.version }}
 				</h1>
 
-				<template v-if="$store.state.versionData.current.changelog">
+				<template v-if="store.state.versionData.current.changelog">
 					<h3>Introduction</h3>
 					<div
 						ref="changelog"
 						class="changelog-text"
-						v-html="$store.state.versionData.current.changelog"
+						v-html="store.state.versionData.current.changelog"
 					></div>
 				</template>
 				<template v-else>
 					<p>Unable to retrieve changelog for current release from GitHub.</p>
 					<p>
 						<a
-							:href="`https://github.com/thelounge/thelounge/releases/tag/v${$store.state.serverConfiguration.version}`"
+							v-if="store.state.serverConfiguration?.version"
+							:href="`https://github.com/thelounge/thelounge/releases/tag/v${store.state.serverConfiguration?.version}`"
 							target="_blank"
 							rel="noopener"
 							>View release notes for this version on GitHub</a
@@ -42,34 +39,29 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, onMounted, onUpdated, ref} from "vue";
 import socket from "../../js/socket";
+import {useStore} from "../../js/store";
 import SidebarToggle from "../SidebarToggle.vue";
 
-export default {
+export default defineComponent({
 	name: "Changelog",
 	components: {
 		SidebarToggle,
 	},
-	mounted() {
-		if (!this.$store.state.versionData) {
-			socket.emit("changelog");
-		}
+	setup() {
+		const store = useStore();
+		const changelog = ref<HTMLDivElement | null>(null);
 
-		this.patchChangelog();
-	},
-	updated() {
-		this.patchChangelog();
-	},
-	methods: {
-		patchChangelog() {
-			if (!this.$refs.changelog) {
+		const patchChangelog = () => {
+			if (!changelog.value) {
 				return;
 			}
 
-			const links = this.$refs.changelog.querySelectorAll("a");
+			const links = changelog.value.querySelectorAll("a");
 
-			for (const link of links) {
+			links.forEach((link) => {
 				// Make sure all links will open a new tab instead of exiting the application
 				link.setAttribute("target", "_blank");
 				link.setAttribute("rel", "noopener");
@@ -78,8 +70,24 @@ export default {
 					// Add required metadata to image links, to support built-in image viewer
 					link.classList.add("toggle-thumbnail");
 				}
+			});
+		};
+
+		onMounted(() => {
+			if (!store.state.versionData) {
+				socket.emit("changelog");
 			}
-		},
+
+			patchChangelog();
+		});
+
+		onUpdated(() => {
+			patchChangelog();
+		});
+
+		return {
+			store,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Windows/Connect.vue b/client/components/Windows/Connect.vue
index 11fc5661..66d2f6e4 100644
--- a/client/components/Windows/Connect.vue
+++ b/client/components/Windows/Connect.vue
@@ -2,11 +2,14 @@
 	<NetworkForm :handle-submit="handleSubmit" :defaults="defaults" :disabled="disabled" />
 </template>
 
-<script>
-import socket from "../../js/socket";
-import NetworkForm from "../NetworkForm.vue";
+<script lang="ts">
+import {defineComponent, ref} from "vue";
 
-export default {
+import socket from "../../js/socket";
+import {useStore} from "../../js/store";
+import NetworkForm, {NetworkFormDefaults} from "../NetworkForm.vue";
+
+export default defineComponent({
 	name: "Connect",
 	components: {
 		NetworkForm,
@@ -14,25 +17,22 @@ export default {
 	props: {
 		queryParams: Object,
 	},
-	data() {
-		// Merge settings from url params into default settings
-		const defaults = Object.assign(
-			{},
-			this.$store.state.serverConfiguration.defaults,
-			this.parseOverrideParams(this.queryParams)
-		);
-		return {
-			disabled: false,
-			defaults,
-		};
-	},
-	methods: {
-		handleSubmit(data) {
-			this.disabled = true;
+	setup(props) {
+		const store = useStore();
+
+		const disabled = ref(false);
+
+		const handleSubmit = (data: Record<string, any>) => {
+			disabled.value = true;
 			socket.emit("network:new", data);
-		},
-		parseOverrideParams(params) {
-			const parsedParams = {};
+		};
+
+		const parseOverrideParams = (params?: Record<string, string>) => {
+			if (!params) {
+				return {};
+			}
+
+			const parsedParams: Record<string, any> = {};
 
 			for (let key of Object.keys(params)) {
 				let value = params[key];
@@ -49,7 +49,7 @@ export default {
 
 				if (
 					!Object.prototype.hasOwnProperty.call(
-						this.$store.state.serverConfiguration.defaults,
+						store.state.serverConfiguration?.defaults,
 						key
 					)
 				) {
@@ -58,7 +58,7 @@ export default {
 
 				// When the network is locked, URL overrides should not affect disabled fields
 				if (
-					this.$store.state.serverConfiguration.lockNetwork &&
+					store.state.serverConfiguration?.lockNetwork &&
 					["name", "host", "port", "tls", "rejectUnauthorized"].includes(key)
 				) {
 					continue;
@@ -78,7 +78,7 @@ export default {
 				}
 
 				// Override server provided defaults with parameters passed in the URL if they match the data type
-				switch (typeof this.$store.state.serverConfiguration.defaults[key]) {
+				switch (typeof store.state.serverConfiguration?.defaults[key]) {
 					case "boolean":
 						if (value === "0" || value === "false") {
 							parsedParams[key] = false;
@@ -97,7 +97,21 @@ export default {
 			}
 
 			return parsedParams;
-		},
+		};
+
+		const defaults = ref<Partial<NetworkFormDefaults>>(
+			Object.assign(
+				{},
+				store.state.serverConfiguration?.defaults,
+				parseOverrideParams(props.queryParams)
+			)
+		);
+
+		return {
+			defaults,
+			disabled,
+			handleSubmit,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Windows/Help.vue b/client/components/Windows/Help.vue
index 2fd029a5..b602864a 100644
--- a/client/components/Windows/Help.vue
+++ b/client/components/Windows/Help.vue
@@ -9,7 +9,7 @@
 			<h2 class="help-version-title">
 				<span>About The Lounge</span>
 				<small>
-					v{{ $store.state.serverConfiguration.version }} (<router-link
+					v{{ store.state.serverConfiguration?.version }} (<router-link
 						id="view-changelog"
 						to="/changelog"
 						>release notes</router-link
@@ -20,13 +20,13 @@
 			<div class="about">
 				<VersionChecker />
 
-				<template v-if="$store.state.serverConfiguration.gitCommit">
+				<template v-if="store.state.serverConfiguration?.gitCommit">
 					<p>
 						The Lounge is running from source (<a
-							:href="`https://github.com/thelounge/thelounge/tree/${$store.state.serverConfiguration.gitCommit}`"
+							:href="`https://github.com/thelounge/thelounge/tree/${store.state.serverConfiguration?.gitCommit}`"
 							target="_blank"
 							rel="noopener"
-							>commit <code>{{ $store.state.serverConfiguration.gitCommit }}</code></a
+							>commit <code>{{ store.state.serverConfiguration?.gitCommit }}</code></a
 						>).
 					</p>
 
@@ -34,11 +34,11 @@
 						<li>
 							Compare
 							<a
-								:href="`https://github.com/thelounge/thelounge/compare/${$store.state.serverConfiguration.gitCommit}...master`"
+								:href="`https://github.com/thelounge/thelounge/compare/${store.state.serverConfiguration?.gitCommit}...master`"
 								target="_blank"
 								rel="noopener"
 								>between
-								<code>{{ $store.state.serverConfiguration.gitCommit }}</code> and
+								<code>{{ store.state.serverConfiguration?.gitCommit }}</code> and
 								<code>master</code></a
 							>
 							to see what you are missing
@@ -46,12 +46,12 @@
 						<li>
 							Compare
 							<a
-								:href="`https://github.com/thelounge/thelounge/compare/${$store.state.serverConfiguration.version}...${$store.state.serverConfiguration.gitCommit}`"
+								:href="`https://github.com/thelounge/thelounge/compare/${store.state.serverConfiguration?.version}...${store.state.serverConfiguration?.gitCommit}`"
 								target="_blank"
 								rel="noopener"
 								>between
-								<code>{{ $store.state.serverConfiguration.version }}</code> and
-								<code>{{ $store.state.serverConfiguration.gitCommit }}</code></a
+								<code>{{ store.state.serverConfiguration?.version }}</code> and
+								<code>{{ store.state.serverConfiguration?.gitCommit }}</code></a
 							>
 							to see your local changes
 						</li>
@@ -749,7 +749,7 @@
 				</div>
 			</div>
 
-			<div v-if="$store.state.settings.searchEnabled" class="help-item">
+			<div v-if="store.state.settings.searchEnabled" class="help-item">
 				<div class="subject">
 					<code>/search query</code>
 				</div>
@@ -829,21 +829,28 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, ref} from "vue";
+import {useStore} from "../../js/store";
 import SidebarToggle from "../SidebarToggle.vue";
 import VersionChecker from "../VersionChecker.vue";
 
-export default {
+export default defineComponent({
 	name: "Help",
 	components: {
 		SidebarToggle,
 		VersionChecker,
 	},
-	data() {
+	setup() {
+		const store = useStore();
+		const isApple = navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i) || false;
+		const isTouch = navigator.maxTouchPoints > 0;
+
 		return {
-			isApple: navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i) || false,
-			isTouch: navigator.maxTouchPoints > 0,
+			isApple,
+			isTouch,
+			store,
 		};
 	},
-};
+});
 </script>
diff --git a/client/components/Windows/NetworkEdit.vue b/client/components/Windows/NetworkEdit.vue
index e0bc4899..420f7aee 100644
--- a/client/components/Windows/NetworkEdit.vue
+++ b/client/components/Windows/NetworkEdit.vue
@@ -7,44 +7,61 @@
 	/>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, onMounted, ref, watch} from "vue";
+import {useRoute} from "vue-router";
+import {switchToChannel} from "../../js/router";
 import socket from "../../js/socket";
-import NetworkForm from "../NetworkForm.vue";
+import {useStore} from "../../js/store";
+import NetworkForm, {NetworkFormDefaults} from "../NetworkForm.vue";
 
-export default {
+export default defineComponent({
 	name: "NetworkEdit",
 	components: {
 		NetworkForm,
 	},
-	data() {
-		return {
-			disabled: false,
-			networkData: null,
+	setup() {
+		const route = useRoute();
+		const store = useStore();
+
+		const disabled = ref(false);
+		const networkData = ref<NetworkFormDefaults | null>(null);
+
+		const setNetworkData = () => {
+			socket.emit("network:get", String(route.params.uuid || ""));
+			networkData.value = store.getters.findNetwork(String(route.params.uuid || ""));
 		};
-	},
-	watch: {
-		"$route.params.uuid"() {
-			this.setNetworkData();
-		},
-	},
-	mounted() {
-		this.setNetworkData();
-	},
-	methods: {
-		setNetworkData() {
-			socket.emit("network:get", this.$route.params.uuid);
-			this.networkData = this.$store.getters.findNetwork(this.$route.params.uuid);
-		},
-		handleSubmit(data) {
-			this.disabled = true;
+
+		const handleSubmit = (data: {uuid: string; name: string}) => {
+			disabled.value = true;
 			socket.emit("network:edit", data);
 
 			// TODO: move networks to vuex and update state when the network info comes in
-			const network = this.$store.getters.findNetwork(data.uuid);
-			network.name = network.channels[0].name = data.name;
+			const network = store.getters.findNetwork(data.uuid);
 
-			this.$root.switchToChannel(network.channels[0]);
-		},
+			if (network) {
+				network.name = network.channels[0].name = data.name;
+
+				switchToChannel(network.channels[0]);
+			}
+		};
+
+		watch(
+			() => route.params.uuid,
+			(newValue) => {
+				setNetworkData();
+			}
+		);
+
+		onMounted(() => {
+			setNetworkData();
+		});
+
+		return {
+			disabled,
+			networkData,
+			handleSubmit,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Windows/SearchResults.vue b/client/components/Windows/SearchResults.vue
index 4401e136..a9dbdb8f 100644
--- a/client/components/Windows/SearchResults.vue
+++ b/client/components/Windows/SearchResults.vue
@@ -3,9 +3,9 @@
 		<div
 			id="chat"
 			:class="{
-				'colored-nicks': $store.state.settings.coloredNicks,
-				'time-seconds': $store.state.settings.showSeconds,
-				'time-12h': $store.state.settings.use12hClock,
+				'colored-nicks': store.state.settings.coloredNicks,
+				'time-seconds': store.state.settings.showSeconds,
+				'time-12h': store.state.settings.use12hClock,
 			}"
 		>
 			<div
@@ -14,12 +14,12 @@
 				aria-label="Search results"
 				role="tabpanel"
 			>
-				<div class="header">
+				<div v-if="network && channel" class="header">
 					<SidebarToggle />
 					<span class="title"
 						>Searching in <span class="channel-name">{{ channel.name }}</span> for</span
 					>
-					<span class="topic">{{ $route.query.q }}</span>
+					<span class="topic">{{ route.query.q }}</span>
 					<MessageSearchForm :network="network" :channel="channel" />
 					<button
 						class="close"
@@ -28,25 +28,24 @@
 						@click="closeSearch"
 					/>
 				</div>
-				<div class="chat-content">
+				<div v-if="network && channel" class="chat-content">
 					<div ref="chat" class="chat" tabindex="-1">
 						<div v-show="moreResultsAvailable" class="show-more">
 							<button
 								ref="loadMoreButton"
 								:disabled="
-									$store.state.messageSearchInProgress ||
-									!$store.state.isConnected
+									store.state.messageSearchInProgress || !store.state.isConnected
 								"
 								class="btn"
 								@click="onShowMoreClick"
 							>
-								<span v-if="$store.state.messageSearchInProgress">Loading…</span>
+								<span v-if="store.state.messageSearchInProgress">Loading…</span>
 								<span v-else>Show older messages</span>
 							</button>
 						</div>
 
 						<div
-							v-if="$store.state.messageSearchInProgress && !offset"
+							v-if="store.state.messageSearchInProgress && !offset"
 							class="search-status"
 						>
 							Searching…
@@ -55,28 +54,30 @@
 							No results found.
 						</div>
 						<div
-							v-else
 							class="messages"
 							role="log"
 							aria-live="polite"
 							aria-relevant="additions"
 						>
-							<template v-for="(message, id) in messages">
-								<div :key="message.id" class="result" @:click="jump(message, id)">
-									<DateMarker
-										v-if="shouldDisplayDateMarker(message, id)"
-										:key="message.date"
-										:message="message"
-									/>
-									<Message
-										:key="message.id"
-										:channel="channel"
-										:network="network"
-										:message="message"
-										:data-id="message.id"
-									/>
-								</div>
-							</template>
+							<div
+								v-for="(message, id) in messages"
+								:key="message.id"
+								class="result"
+								@click="jump(message, id)"
+							>
+								<DateMarker
+									v-if="shouldDisplayDateMarker(message, id)"
+									:key="message.id + '-date'"
+									:message="message"
+								/>
+								<Message
+									:key="message.id"
+									:channel="channel"
+									:network="network"
+									:message="message"
+									:data-id="message.id"
+								/>
+							</div>
 						</div>
 					</div>
 				</div>
@@ -91,7 +92,7 @@
 }
 </style>
 
-<script>
+<script lang="ts">
 import socket from "../../js/socket";
 import eventbus from "../../js/eventbus";
 
@@ -99,8 +100,14 @@ import SidebarToggle from "../SidebarToggle.vue";
 import Message from "../Message.vue";
 import MessageSearchForm from "../MessageSearchForm.vue";
 import DateMarker from "../DateMarker.vue";
+import {watch, computed, defineComponent, nextTick, ref, onMounted, onUnmounted} from "vue";
+import type {ClientMessage} from "../../js/types";
 
-export default {
+import {useStore} from "../../js/store";
+import {useRoute, useRouter} from "vue-router";
+import {switchToChannel} from "../../js/router";
+
+export default defineComponent({
 	name: "SearchResults",
 	components: {
 		SidebarToggle,
@@ -108,145 +115,212 @@ export default {
 		DateMarker,
 		MessageSearchForm,
 	},
-	data() {
-		return {
-			offset: 0,
-			moreResultsAvailable: false,
-			oldScrollTop: 0,
-			oldChatHeight: 0,
-		};
-	},
-	computed: {
-		search() {
-			return this.$store.state.messageSearchResults;
-		},
-		messages() {
-			if (!this.search) {
+	setup() {
+		const store = useStore();
+		const route = useRoute();
+		const router = useRouter();
+
+		const chat = ref<HTMLDivElement>();
+
+		const loadMoreButton = ref<HTMLButtonElement>();
+
+		const offset = ref(0);
+		const moreResultsAvailable = ref(false);
+		const oldScrollTop = ref(0);
+		const oldChatHeight = ref(0);
+
+		const search = computed(() => store.state.messageSearchResults);
+		const messages = computed(() => {
+			if (!search.value) {
 				return [];
 			}
 
-			return this.search.results;
-		},
-		chan() {
-			const chanId = parseInt(this.$route.params.id, 10);
-			return this.$store.getters.findChannel(chanId);
-		},
-		network() {
-			if (!this.chan) {
+			return search.value.results;
+		});
+
+		const chan = computed(() => {
+			const chanId = parseInt(String(route.params.id || ""), 10);
+			return store.getters.findChannel(chanId);
+		});
+
+		const network = computed(() => {
+			if (!chan.value) {
 				return null;
 			}
 
-			return this.chan.network;
-		},
-		channel() {
-			if (!this.chan) {
+			return chan.value.network;
+		});
+
+		const channel = computed(() => {
+			if (!chan.value) {
 				return null;
 			}
 
-			return this.chan.channel;
-		},
-	},
-	watch: {
-		"$route.params.id"() {
-			this.doSearch();
-			this.setActiveChannel();
-		},
-		"$route.query.q"() {
-			this.doSearch();
-			this.setActiveChannel();
-		},
-		messages() {
-			this.moreResultsAvailable = this.messages.length && !(this.messages.length % 100);
+			return chan.value.channel;
+		});
 
-			if (!this.offset) {
-				this.jumpToBottom();
-			} else {
-				this.$nextTick(() => {
-					const currentChatHeight = this.$refs.chat.scrollHeight;
-					this.$refs.chat.scrollTop =
-						this.oldScrollTop + currentChatHeight - this.oldChatHeight;
-				});
+		const setActiveChannel = () => {
+			if (!chan.value) {
+				return;
 			}
-		},
-	},
-	mounted() {
-		this.setActiveChannel();
-		this.doSearch();
 
-		eventbus.on("escapekey", this.closeSearch);
-		this.$root.$on("re-search", this.doSearch); // Enable MessageSearchForm to search for the same query again
-	},
-	beforeDestroy() {
-		this.$root.$off("re-search");
-	},
-	destroyed() {
-		eventbus.off("escapekey", this.closeSearch);
-	},
-	methods: {
-		setActiveChannel() {
-			this.$store.commit("activeChannel", this.chan);
-		},
-		closeSearch() {
-			this.$root.switchToChannel(this.channel);
-		},
-		shouldDisplayDateMarker(message, id) {
-			const previousMessage = this.messages[id - 1];
+			store.commit("activeChannel", chan.value);
+		};
+
+		const closeSearch = () => {
+			if (!channel.value) {
+				return;
+			}
+
+			switchToChannel(channel.value);
+		};
+
+		const shouldDisplayDateMarker = (message: ClientMessage, id: number) => {
+			const previousMessage = messages.value[id - 1];
 
 			if (!previousMessage) {
 				return true;
 			}
 
 			return new Date(previousMessage.time).getDay() !== new Date(message.time).getDay();
-		},
-		doSearch() {
-			this.offset = 0;
-			this.$store.commit("messageSearchInProgress", true);
+		};
 
-			if (!this.offset) {
-				this.$store.commit("messageSearchResults", null); // Only reset if not getting offset
+		const doSearch = () => {
+			offset.value = 0;
+			store.commit("messageSearchInProgress", true);
+
+			if (!offset.value) {
+				store.commit("messageSearchInProgress", undefined); // Only reset if not getting offset
 			}
 
 			socket.emit("search", {
-				networkUuid: this.network.uuid,
-				channelName: this.channel.name,
-				searchTerm: this.$route.query.q,
-				offset: this.offset,
+				networkUuid: network.value?.uuid,
+				channelName: channel.value?.name,
+				searchTerm: String(route.query.q || ""),
+				offset: offset.value,
 			});
-		},
-		onShowMoreClick() {
-			this.offset += 100;
-			this.$store.commit("messageSearchInProgress", true);
+		};
 
-			this.oldScrollTop = this.$refs.chat.scrollTop;
-			this.oldChatHeight = this.$refs.chat.scrollHeight;
+		const onShowMoreClick = () => {
+			if (!chat.value) {
+				return;
+			}
+
+			offset.value += 100;
+			store.commit("messageSearchInProgress", true);
+
+			oldScrollTop.value = chat.value.scrollTop;
+			oldChatHeight.value = chat.value.scrollHeight;
 
 			socket.emit("search", {
-				networkUuid: this.network.uuid,
-				channelName: this.channel.name,
-				searchTerm: this.$route.query.q,
-				offset: this.offset + 1,
+				networkUuid: network.value?.uuid,
+				channelName: channel.value?.name,
+				searchTerm: String(route.query.q || ""),
+				offset: offset.value + 1,
 			});
-		},
-		jumpToBottom() {
-			this.$nextTick(() => {
-				const el = this.$refs.chat;
-				el.scrollTop = el.scrollHeight;
-			});
-		},
-		jump(message, id) {
+		};
+
+		const jumpToBottom = async () => {
+			await nextTick();
+
+			const el = chat.value;
+
+			if (!el) {
+				return;
+			}
+
+			el.scrollTop = el.scrollHeight;
+		};
+
+		const jump = (message: ClientMessage, id: number) => {
 			// TODO: Implement jumping to messages!
 			// This is difficult because it means client will need to handle a potentially nonlinear message set
 			// (loading IntersectionObserver both before AND after the messages)
-			this.$router.push({
-				name: "MessageList",
-				params: {
-					id: this.chan.id,
-				},
-				query: {
-					focused: id,
-				},
-			});
-		},
+			router
+				.push({
+					name: "MessageList",
+					params: {
+						id: channel.value?.id,
+					},
+					query: {
+						focused: id,
+					},
+				})
+				.catch((e) => {
+					// eslint-disable-next-line no-console
+					console.error(`Failed to navigate to message ${id}`, e);
+				});
+		};
+
+		watch(
+			() => route.params.id,
+			() => {
+				doSearch();
+				setActiveChannel();
+			}
+		);
+
+		watch(
+			() => route.query,
+			() => {
+				doSearch();
+				setActiveChannel();
+			}
+		);
+
+		watch(messages, async () => {
+			moreResultsAvailable.value = !!(
+				messages.value.length && !(messages.value.length % 100)
+			);
+
+			if (!offset.value) {
+				await jumpToBottom();
+			} else {
+				await nextTick();
+
+				const el = chat.value;
+
+				if (!el) {
+					return;
+				}
+
+				const currentChatHeight = el.scrollHeight;
+				el.scrollTop = oldScrollTop.value + currentChatHeight - oldChatHeight.value;
+			}
+		});
+
+		onMounted(() => {
+			setActiveChannel();
+			doSearch();
+
+			eventbus.on("escapekey", closeSearch);
+			eventbus.on("re-search", doSearch);
+		});
+
+		onUnmounted(() => {
+			eventbus.off("escapekey", closeSearch);
+			eventbus.off("re-search", doSearch);
+		});
+
+		return {
+			chat,
+			loadMoreButton,
+			messages,
+			moreResultsAvailable,
+			search,
+			network,
+			channel,
+			route,
+			offset,
+			store,
+			setActiveChannel,
+			closeSearch,
+			shouldDisplayDateMarker,
+			doSearch,
+			onShowMoreClick,
+			jumpToBottom,
+			jump,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Windows/Settings.vue b/client/components/Windows/Settings.vue
index 47ebc732..61b265cf 100644
--- a/client/components/Windows/Settings.vue
+++ b/client/components/Windows/Settings.vue
@@ -7,42 +7,52 @@
 
 		<div class="container">
 			<form ref="settingsForm" autocomplete="off" @change="onChange" @submit.prevent>
-				<router-view></router-view>
+				<router-view :settings-form="settingsForm"></router-view>
 			</form>
 		</div>
 	</div>
 </template>
 
-<script>
+<script lang="ts">
+import {defineComponent, ref} from "vue";
 import SidebarToggle from "../SidebarToggle.vue";
 import Navigation from "../Settings/Navigation.vue";
+import {useStore} from "../../js/store";
 
-export default {
+export default defineComponent({
 	name: "Settings",
 	components: {
 		SidebarToggle,
 		Navigation,
 	},
-	methods: {
-		onChange(event) {
+	setup() {
+		const store = useStore();
+		const settingsForm = ref<HTMLFormElement>();
+
+		const onChange = (event: Event) => {
 			const ignore = ["old_password", "new_password", "verify_password"];
 
-			const name = event.target.name;
+			const name = (event.target as HTMLInputElement).name;
 
 			if (ignore.includes(name)) {
 				return;
 			}
 
-			let value;
+			let value: boolean | string;
 
-			if (event.target.type === "checkbox") {
-				value = event.target.checked;
+			if ((event.target as HTMLInputElement).type === "checkbox") {
+				value = (event.target as HTMLInputElement).checked;
 			} else {
-				value = event.target.value;
+				value = (event.target as HTMLInputElement).value;
 			}
 
-			this.$store.dispatch("settings/update", {name, value, sync: true});
-		},
+			void store.dispatch("settings/update", {name, value, sync: true});
+		};
+
+		return {
+			onChange,
+			settingsForm,
+		};
 	},
-};
+});
 </script>
diff --git a/client/components/Windows/SignIn.vue b/client/components/Windows/SignIn.vue
index 0d95ced9..30963206 100644
--- a/client/components/Windows/SignIn.vue
+++ b/client/components/Windows/SignIn.vue
@@ -55,51 +55,69 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
 import storage from "../../js/localStorage";
 import socket from "../../js/socket";
 import RevealPassword from "../RevealPassword.vue";
+import {defineComponent, onBeforeUnmount, onMounted, ref} from "vue";
 
-export default {
+export default defineComponent({
 	name: "SignIn",
 	components: {
 		RevealPassword,
 	},
-	data() {
-		return {
-			inFlight: false,
-			errorShown: false,
+	setup() {
+		const inFlight = ref(false);
+		const errorShown = ref(false);
+
+		const username = ref<HTMLInputElement | null>(null);
+		const password = ref<HTMLInputElement | null>(null);
+
+		const onAuthFailed = () => {
+			inFlight.value = false;
+			errorShown.value = true;
 		};
-	},
-	mounted() {
-		socket.on("auth:failed", this.onAuthFailed);
-	},
-	beforeDestroy() {
-		socket.off("auth:failed", this.onAuthFailed);
-	},
-	methods: {
-		onAuthFailed() {
-			this.inFlight = false;
-			this.errorShown = true;
-		},
-		onSubmit(event) {
+
+		const onSubmit = (event: Event) => {
 			event.preventDefault();
 
-			this.inFlight = true;
-			this.errorShown = false;
+			if (!username.value || !password.value) {
+				return;
+			}
+
+			inFlight.value = true;
+			errorShown.value = false;
 
 			const values = {
-				user: this.$refs.username.value,
-				password: this.$refs.password.value,
+				user: username.value?.value,
+				password: password.value?.value,
 			};
 
 			storage.set("user", values.user);
 
 			socket.emit("auth:perform", values);
-		},
-		getStoredUser() {
+		};
+
+		const getStoredUser = () => {
 			return storage.get("user");
-		},
+		};
+
+		onMounted(() => {
+			socket.on("auth:failed", onAuthFailed);
+		});
+
+		onBeforeUnmount(() => {
+			socket.off("auth:failed", onAuthFailed);
+		});
+
+		return {
+			inFlight,
+			errorShown,
+			username,
+			password,
+			onSubmit,
+			getStoredUser,
+		};
 	},
-};
+});
 </script>
diff --git a/client/css/style.css b/client/css/style.css
index 5ababcf9..d28499d2 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -587,6 +587,11 @@ p {
 
 /* End icons */
 
+#app {
+	height: 100%;
+	width: 100%;
+}
+
 #viewport {
 	display: flex;
 	height: 100%;
diff --git a/client/index.html.tpl b/client/index.html.tpl
index 3557fcf1..7275a84f 100644
--- a/client/index.html.tpl
+++ b/client/index.html.tpl
@@ -48,7 +48,7 @@
 
 	</head>
 	<body class="<%- public ? " public" : "" %>" data-transports="<%- JSON.stringify(transports) %>">
-		<div id="viewport"></div>
+		<div id="app"></div>
 		<div id="loading">
 			<div class="window">
 				<div id="loading-status-container">
diff --git a/client/js/auth.js b/client/js/auth.ts
similarity index 91%
rename from client/js/auth.js
rename to client/js/auth.ts
index 308031fd..5a764f86 100644
--- a/client/js/auth.js
+++ b/client/js/auth.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import storage from "./localStorage";
 import location from "./location";
 
diff --git a/client/js/autocompletion.js b/client/js/autocompletion.ts
similarity index 69%
rename from client/js/autocompletion.js
rename to client/js/autocompletion.ts
index f362a749..b85f7c73 100644
--- a/client/js/autocompletion.js
+++ b/client/js/autocompletion.ts
@@ -1,92 +1,92 @@
-"use strict";
-
-const constants = require("./constants");
+import constants from "./constants";
 
 import Mousetrap from "mousetrap";
-import {Textcomplete} from "@textcomplete/core/dist/Textcomplete";
-import {TextareaEditor} from "@textcomplete/textarea/dist/TextareaEditor";
+import {Strategy, Textcomplete, StrategyProps} from "@textcomplete/core";
+import {TextareaEditor} from "@textcomplete/textarea";
 
 import fuzzy from "fuzzy";
 
 import emojiMap from "./helpers/simplemap.json";
-import store from "./store";
+import {store} from "./store";
 
 export default enableAutocomplete;
 
 const emojiSearchTerms = Object.keys(emojiMap);
-const emojiStrategy = {
+const emojiStrategy: StrategyProps = {
 	id: "emoji",
 	match: /(^|\s):([-+\w:?]{2,}):?$/,
-	search(term, callback) {
+	search(term: string, callback: (matches) => void) {
 		// Trim colon from the matched term,
 		// as we are unable to get a clean string from match regex
 		term = term.replace(/:$/, "");
 		callback(fuzzyGrep(term, emojiSearchTerms));
 	},
-	template([string, original]) {
-		return `<span class="emoji">${emojiMap[original]}</span> ${string}`;
+	template([string, original]: [string, string]) {
+		return `<span class="emoji">${String(emojiMap[original])}</span> ${string}`;
 	},
-	replace([, original]) {
-		return "$1" + emojiMap[original];
+	replace([, original]: [string, string]) {
+		return "$1" + String(emojiMap[original]);
 	},
 	index: 2,
 };
 
-const nicksStrategy = {
+const nicksStrategy: StrategyProps = {
 	id: "nicks",
 	match: /(^|\s)(@([a-zA-Z_[\]\\^{}|`@][a-zA-Z0-9_[\]\\^{}|`-]*)?)$/,
-	search(term, callback) {
+	search(term: string, callback: (matches: string[] | string[][]) => void) {
 		term = term.slice(1);
 
 		if (term[0] === "@") {
+			// TODO: type
+			// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 			callback(completeNicks(term.slice(1), true).map((val) => ["@" + val[0], "@" + val[1]]));
 		} else {
 			callback(completeNicks(term, true));
 		}
 	},
-	template([string]) {
+	template([string]: [string, string]) {
 		return string;
 	},
-	replace([, original]) {
+	replace([, original]: [string, string]) {
 		return "$1" + replaceNick(original);
 	},
 	index: 2,
 };
 
-const chanStrategy = {
+const chanStrategy: StrategyProps = {
 	id: "chans",
 	match: /(^|\s)((?:#|\+|&|![A-Z0-9]{5})(?:[^\s]+)?)$/,
-	search(term, callback) {
+	search(term: string, callback: (matches: string[][]) => void) {
 		callback(completeChans(term));
 	},
-	template([string]) {
+	template([string]: [string, string]) {
 		return string;
 	},
-	replace([, original]) {
+	replace([, original]: [string, string]) {
 		return "$1" + original;
 	},
 	index: 2,
 };
 
-const commandStrategy = {
+const commandStrategy: StrategyProps = {
 	id: "commands",
 	match: /^\/(\w*)$/,
-	search(term, callback) {
+	search(term: string, callback: (matches: string[][]) => void) {
 		callback(completeCommands("/" + term));
 	},
-	template([string]) {
+	template([string]: [string, string]) {
 		return string;
 	},
-	replace([, original]) {
+	replace([, original]: [string, string]) {
 		return original;
 	},
 	index: 1,
 };
 
-const foregroundColorStrategy = {
+const foregroundColorStrategy: StrategyProps = {
 	id: "foreground-colors",
 	match: /\x03(\d{0,2}|[A-Za-z ]{0,10})$/,
-	search(term, callback) {
+	search(term: string, callback: (matches: string[][]) => void) {
 		term = term.toLowerCase();
 
 		const matchingColorCodes = constants.colorCodeMap
@@ -107,19 +107,19 @@ const foregroundColorStrategy = {
 
 		callback(matchingColorCodes);
 	},
-	template(value) {
+	template(value: string[]) {
 		return `<span class="irc-fg${parseInt(value[0], 10)}">${value[1]}</span>`;
 	},
-	replace(value) {
+	replace(value: string) {
 		return "\x03" + value[0];
 	},
 	index: 1,
 };
 
-const backgroundColorStrategy = {
+const backgroundColorStrategy: StrategyProps = {
 	id: "background-colors",
 	match: /\x03(\d{2}),(\d{0,2}|[A-Za-z ]{0,10})$/,
-	search(term, callback, match) {
+	search(term: string, callback: (matchingColorCodes: string[][]) => void, match: string[]) {
 		term = term.toLowerCase();
 		const matchingColorCodes = constants.colorCodeMap
 			.filter((i) => fuzzy.test(term, i[0]) || fuzzy.test(term, i[1]))
@@ -140,25 +140,25 @@ const backgroundColorStrategy = {
 
 		callback(matchingColorCodes);
 	},
-	template(value) {
+	template(value: string[]) {
 		return `<span class="irc-fg${parseInt(value[2], 10)} irc-bg irc-bg${parseInt(
 			value[0],
 			10
 		)}">${value[1]}</span>`;
 	},
-	replace(value) {
+	replace(value: string[]) {
 		return "\x03$1," + value[0];
 	},
 	index: 2,
 };
 
-function enableAutocomplete(input) {
+function enableAutocomplete(input: HTMLTextAreaElement) {
 	let tabCount = 0;
 	let lastMatch = "";
-	let currentMatches = [];
+	let currentMatches: string[] | string[][] = [];
 
 	input.addEventListener("input", (e) => {
-		if (e.detail === "autocomplete") {
+		if ((e as CustomEvent).detail === "autocomplete") {
 			return;
 		}
 
@@ -179,7 +179,7 @@ function enableAutocomplete(input) {
 			const text = input.value;
 
 			if (tabCount === 0) {
-				lastMatch = text.substring(0, input.selectionStart).split(/\s/).pop();
+				lastMatch = text.substring(0, input.selectionStart).split(/\s/).pop() || "";
 
 				if (lastMatch.length === 0) {
 					return;
@@ -194,12 +194,14 @@ function enableAutocomplete(input) {
 
 			const position = input.selectionStart - lastMatch.length;
 			const newMatch = replaceNick(
-				currentMatches[tabCount % currentMatches.length],
+				// TODO: type this properly
+				String(currentMatches[tabCount % currentMatches.length]),
 				position
 			);
-			const remainder = text.substr(input.selectionStart);
+			const remainder = text.substring(input.selectionStart);
 
 			input.value = text.substr(0, position) + newMatch + remainder;
+
 			input.selectionStart -= remainder.length;
 			input.selectionEnd = input.selectionStart;
 
@@ -252,14 +254,14 @@ function enableAutocomplete(input) {
 	};
 }
 
-function replaceNick(original, position = 1) {
+function replaceNick(original: string, position = 1) {
 	// If no postfix specified, return autocompleted nick as-is
 	if (!store.state.settings.nickPostfix) {
 		return original;
 	}
 
 	// If there is whitespace in the input already, append space to nick
-	if (position > 0 && /\s/.test(store.state.activeChannel.channel.pendingMessage)) {
+	if (position > 0 && /\s/.test(store.state.activeChannel?.channel.pendingMessage || "")) {
 		return original + " ";
 	}
 
@@ -267,7 +269,7 @@ function replaceNick(original, position = 1) {
 	return original + store.state.settings.nickPostfix;
 }
 
-function fuzzyGrep(term, array) {
+function fuzzyGrep<T>(term: string, array: Array<T>) {
 	const results = fuzzy.filter(term, array, {
 		pre: "<b>",
 		post: "</b>",
@@ -276,6 +278,10 @@ function fuzzyGrep(term, array) {
 }
 
 function rawNicks() {
+	if (!store.state.activeChannel) {
+		return [];
+	}
+
 	if (store.state.activeChannel.channel.users.length > 0) {
 		const users = store.state.activeChannel.channel.users.slice();
 
@@ -294,7 +300,7 @@ function rawNicks() {
 	return [me];
 }
 
-function completeNicks(word, isFuzzy) {
+function completeNicks(word: string, isFuzzy: boolean) {
 	const users = rawNicks();
 	word = word.toLowerCase();
 
@@ -315,18 +321,20 @@ function getCommands() {
 	return cmds;
 }
 
-function completeCommands(word) {
+function completeCommands(word: string) {
 	const commands = getCommands();
 	return fuzzyGrep(word, commands);
 }
 
-function completeChans(word) {
-	const words = [];
+function completeChans(word: string) {
+	const words: string[] = [];
 
-	for (const channel of store.state.activeChannel.network.channels) {
-		// Push all channels that start with the same CHANTYPE
-		if (channel.type === "channel" && channel.name[0] === word[0]) {
-			words.push(channel.name);
+	if (store.state.activeChannel) {
+		for (const channel of store.state.activeChannel.network.channels) {
+			// Push all channels that start with the same CHANTYPE
+			if (channel.type === "channel" && channel.name[0] === word[0]) {
+				words.push(channel.name);
+			}
 		}
 	}
 
diff --git a/client/js/clipboard.js b/client/js/clipboard.ts
similarity index 78%
rename from client/js/clipboard.js
rename to client/js/clipboard.ts
index fccf31b8..3409b395 100644
--- a/client/js/clipboard.js
+++ b/client/js/clipboard.ts
@@ -1,13 +1,16 @@
-"use strict";
-
-export default function (chat) {
+export default function (chat: HTMLDivElement) {
 	// Disable in Firefox as it already copies flex text correctly
+	// @ts-expect-error Property 'InstallTrigger' does not exist on type 'Window & typeof globalThis'.ts(2339)
 	if (typeof window.InstallTrigger !== "undefined") {
 		return;
 	}
 
 	const selection = window.getSelection();
 
+	if (!selection) {
+		return;
+	}
+
 	// If selection does not span multiple elements, do nothing
 	if (selection.anchorNode === selection.focusNode) {
 		return;
diff --git a/client/js/commands/collapse.js b/client/js/commands/collapse.ts
similarity index 78%
rename from client/js/commands/collapse.js
rename to client/js/commands/collapse.ts
index e8b4a7b8..2d74a8f5 100644
--- a/client/js/commands/collapse.js
+++ b/client/js/commands/collapse.ts
@@ -1,10 +1,12 @@
-"use strict";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 
 function input() {
-	const messageIds = [];
+	if (!store.state.activeChannel) {
+		return;
+	}
+
+	const messageIds: number[] = [];
 
 	for (const message of store.state.activeChannel.channel.messages) {
 		let toggled = false;
@@ -24,7 +26,7 @@ function input() {
 	// Tell the server we're toggling so it remembers at page reload
 	if (!document.body.classList.contains("public") && messageIds.length > 0) {
 		socket.emit("msg:preview:toggle", {
-			target: store.state.activeChannel.channel.id,
+			target: store.state.activeChannel?.channel.id,
 			messageIds: messageIds,
 			shown: false,
 		});
diff --git a/client/js/commands/expand.js b/client/js/commands/expand.ts
similarity index 78%
rename from client/js/commands/expand.js
rename to client/js/commands/expand.ts
index 8922a9ca..791319a1 100644
--- a/client/js/commands/expand.js
+++ b/client/js/commands/expand.ts
@@ -1,10 +1,12 @@
-"use strict";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 
 function input() {
-	const messageIds = [];
+	if (!store.state.activeChannel) {
+		return;
+	}
+
+	const messageIds: number[] = [];
 
 	for (const message of store.state.activeChannel.channel.messages) {
 		let toggled = false;
@@ -24,7 +26,7 @@ function input() {
 	// Tell the server we're toggling so it remembers at page reload
 	if (!document.body.classList.contains("public") && messageIds.length > 0) {
 		socket.emit("msg:preview:toggle", {
-			target: store.state.activeChannel.channel.id,
+			target: store.state.activeChannel?.channel.id,
 			messageIds: messageIds,
 			shown: true,
 		});
diff --git a/client/js/commands/index.js b/client/js/commands/index.ts
similarity index 76%
rename from client/js/commands/index.js
rename to client/js/commands/index.ts
index 554c7ab0..247ed3e3 100644
--- a/client/js/commands/index.js
+++ b/client/js/commands/index.ts
@@ -1,14 +1,12 @@
-"use strict";
-
 // Taken from views/index.js
 
 // This creates a version of `require()` in the context of the current
 // directory, so we iterate over its content, which is a map statically built by
 // Webpack.
 // Second argument says it's recursive, third makes sure we only load javascript.
-const commands = require.context("./", true, /\.js$/);
+const commands = require.context("./", true, /\.ts$/);
 
-export default commands.keys().reduce((acc, path) => {
+export default commands.keys().reduce<Record<string, unknown>>((acc, path) => {
 	const command = path.substring(2, path.length - 3);
 
 	if (command === "index") {
diff --git a/client/js/commands/join.js b/client/js/commands/join.ts
similarity index 67%
rename from client/js/commands/join.js
rename to client/js/commands/join.ts
index dd62994e..64776e64 100644
--- a/client/js/commands/join.js
+++ b/client/js/commands/join.ts
@@ -1,15 +1,13 @@
-"use strict";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 import {switchToChannel} from "../router";
 
-function input(args) {
+function input(args: string[]) {
 	if (args.length > 0) {
 		let channels = args[0];
 
 		if (channels.length > 0) {
-			const chanTypes = store.state.activeChannel.network.serverOptions.CHANTYPES;
+			const chanTypes = store.state.activeChannel?.network.serverOptions.CHANTYPES;
 			const channelList = args[0].split(",");
 
 			if (chanTypes && chanTypes.length > 0) {
@@ -27,15 +25,17 @@ function input(args) {
 			if (chan) {
 				switchToChannel(chan);
 			} else {
-				socket.emit("input", {
-					text: `/join ${channels} ${args.length > 1 ? args[1] : ""}`,
-					target: store.state.activeChannel.channel.id,
-				});
+				if (store.state.activeChannel) {
+					socket.emit("input", {
+						text: `/join ${channels} ${args.length > 1 ? args[1] : ""}`,
+						target: store.state.activeChannel.channel.id,
+					});
+				}
 
 				return true;
 			}
 		}
-	} else if (store.state.activeChannel.channel.type === "channel") {
+	} else if (store.state.activeChannel?.channel.type === "channel") {
 		// If `/join` command is used without any arguments, re-join current channel
 		socket.emit("input", {
 			target: store.state.activeChannel.channel.id,
diff --git a/client/js/commands/search.js b/client/js/commands/search.js
deleted file mode 100644
index f02deb3b..00000000
--- a/client/js/commands/search.js
+++ /dev/null
@@ -1,24 +0,0 @@
-"use strict";
-
-import store from "../store";
-import {router} from "../router";
-
-function input(args) {
-	if (!store.state.settings.searchEnabled) {
-		return false;
-	}
-
-	router.push({
-		name: "SearchResults",
-		params: {
-			id: store.state.activeChannel.channel.id,
-		},
-		query: {
-			q: args.join(" "),
-		},
-	});
-
-	return true;
-}
-
-export default {input};
diff --git a/client/js/commands/search.ts b/client/js/commands/search.ts
new file mode 100644
index 00000000..b6231725
--- /dev/null
+++ b/client/js/commands/search.ts
@@ -0,0 +1,27 @@
+import {store} from "../store";
+import {router} from "../router";
+
+function input(args: string[]) {
+	if (!store.state.settings.searchEnabled) {
+		return false;
+	}
+
+	router
+		.push({
+			name: "SearchResults",
+			params: {
+				id: store.state.activeChannel?.channel.id,
+			},
+			query: {
+				q: args.join(" "),
+			},
+		})
+		.catch((e: Error) => {
+			// eslint-disable-next-line no-console
+			console.error(`Failed to push SearchResults route: ${e.message}`);
+		});
+
+	return true;
+}
+
+export default {input};
diff --git a/client/js/constants.js b/client/js/constants.ts
similarity index 87%
rename from client/js/constants.js
rename to client/js/constants.ts
index 59ad6e87..e45decf4 100644
--- a/client/js/constants.js
+++ b/client/js/constants.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 const colorCodeMap = [
 	["00", "White"],
 	["01", "Black"],
@@ -28,10 +26,9 @@ const timeFormats = {
 	msg12hWithSeconds: "hh:mm:ss A",
 };
 
-// This file is required by server, can't use es6 export
-module.exports = {
+export default {
 	colorCodeMap,
-	commands: [],
+	commands: [] as string[],
 	condensedTypes,
 	timeFormats,
 	// Same value as media query in CSS that forces sidebars to become overlays
diff --git a/client/js/eventbus.js b/client/js/eventbus.ts
similarity index 77%
rename from client/js/eventbus.js
rename to client/js/eventbus.ts
index dade7851..fe065c40 100644
--- a/client/js/eventbus.js
+++ b/client/js/eventbus.ts
@@ -7,7 +7,7 @@ class EventBus {
 	 * @param  {String} type    Type of event to listen for.
 	 * @param  {Function} handler Function to call in response to given event.
 	 */
-	on(type, handler) {
+	on(type: string, handler: (...evt: any[]) => void) {
 		if (events.has(type)) {
 			events.get(type).push(handler);
 		} else {
@@ -21,11 +21,11 @@ class EventBus {
 	 * @param  {String} type    Type of event to unregister `handler` from.
 	 * @param  {Function} handler Handler function to remove.
 	 */
-	off(type, handler) {
+	off(type: string, handler: (...evt: any[]) => void) {
 		if (events.has(type)) {
 			events.set(
 				type,
-				events.get(type).filter((item) => item !== handler)
+				events.get(type).filter((item: (...evt: any[]) => void) => item !== handler)
 			);
 		}
 	}
@@ -36,12 +36,12 @@ class EventBus {
 	 * @param {String} type  The event type to invoke.
 	 * @param {Any} [evt]  Any value (object is recommended and powerful), passed to each handler.
 	 */
-	emit(type, ...evt) {
+	emit(type: string, ...evt: any) {
 		if (events.has(type)) {
 			events
 				.get(type)
 				.slice()
-				.map((handler) => {
+				.map((handler: (...evts: any[]) => void) => {
 					handler(...evt);
 				});
 		}
diff --git a/client/js/helpers/collapseNetwork.js b/client/js/helpers/collapseNetwork.ts
similarity index 96%
rename from client/js/helpers/collapseNetwork.js
rename to client/js/helpers/collapseNetwork.ts
index 4fe31420..dd598e92 100644
--- a/client/js/helpers/collapseNetwork.js
+++ b/client/js/helpers/collapseNetwork.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import storage from "../localStorage";
 
 export default (network, isCollapsed) => {
diff --git a/client/js/helpers/colorClass.js b/client/js/helpers/colorClass.ts
similarity index 78%
rename from client/js/helpers/colorClass.js
rename to client/js/helpers/colorClass.ts
index c327c0e3..c9896f70 100644
--- a/client/js/helpers/colorClass.js
+++ b/client/js/helpers/colorClass.ts
@@ -1,7 +1,5 @@
-"use strict";
-
 // Generates a string from "color-1" to "color-32" based on an input string
-export default (str) => {
+export default (str: string) => {
 	let hash = 0;
 
 	for (let i = 0; i < str.length; i++) {
@@ -13,5 +11,5 @@ export default (str) => {
 		due to A being ascii 65 (100 0001)
 		 while a being ascii 97 (110 0001)
 	*/
-	return "color-" + (1 + (hash % 32));
+	return "color-" + (1 + (hash % 32)).toString();
 };
diff --git a/client/js/helpers/contextMenu.js b/client/js/helpers/contextMenu.ts
similarity index 80%
rename from client/js/helpers/contextMenu.js
rename to client/js/helpers/contextMenu.ts
index e3196871..73db9692 100644
--- a/client/js/helpers/contextMenu.js
+++ b/client/js/helpers/contextMenu.ts
@@ -1,9 +1,39 @@
-"use strict";
-
 import socket from "../socket";
 import eventbus from "../eventbus";
+import type {ClientChan, ClientNetwork, ClientUser} from "../types";
+import {switchToChannel} from "../router";
+import {TypedStore} from "../store";
+import useCloseChannel from "../hooks/use-close-channel";
+
+type BaseContextMenuItem = {
+	label: string;
+	type: string;
+	class: string;
+};
+
+type ContextMenuItemWithAction = BaseContextMenuItem & {
+	action: () => void;
+};
+
+type ContextMenuItemWithLink = BaseContextMenuItem & {
+	link?: string;
+};
+
+type ContextMenuDividerItem = {
+	type: "divider";
+};
+
+export type ContextMenuItem =
+	| ContextMenuItemWithAction
+	| ContextMenuItemWithLink
+	| ContextMenuDividerItem;
+
+export function generateChannelContextMenu(
+	channel: ClientChan,
+	network: ClientNetwork
+): ContextMenuItem[] {
+	const closeChannel = useCloseChannel(channel);
 
-export function generateChannelContextMenu($root, channel, network) {
 	const typeMap = {
 		lobby: "network",
 		channel: "chan",
@@ -18,7 +48,7 @@ export function generateChannelContextMenu($root, channel, network) {
 		special: "Close",
 	};
 
-	let items = [
+	let items: ContextMenuItem[] = [
 		{
 			label: channel.name,
 			type: "item",
@@ -98,7 +128,7 @@ export function generateChannelContextMenu($root, channel, network) {
 			class: "edit",
 			action() {
 				channel.editTopic = true;
-				$root.switchToChannel(channel);
+				switchToChannel(channel);
 			},
 		});
 		items.push({
@@ -122,7 +152,7 @@ export function generateChannelContextMenu($root, channel, network) {
 				type: "item",
 				class: "action-whois",
 				action() {
-					$root.switchToChannel(channel);
+					switchToChannel(channel);
 					socket.emit("input", {
 						target: channel.id,
 						text: "/whois " + channel.name,
@@ -170,13 +200,13 @@ export function generateChannelContextMenu($root, channel, network) {
 		});
 	}
 
-	const humanFriendlyChanTypeMap = {
+	const humanFriendlyChanTypeMap: Record<string, string> = {
 		lobby: "network",
 		channel: "channel",
 		query: "conversation",
 	};
 
-	// We don't allow the muting of Chan.Type.SPECIAL channels
+	// We don't allow the muting of ChanType.SPECIAL channels
 	const mutableChanTypes = Object.keys(humanFriendlyChanTypeMap);
 
 	if (mutableChanTypes.includes(channel.type)) {
@@ -201,23 +231,27 @@ export function generateChannelContextMenu($root, channel, network) {
 		type: "item",
 		class: "close",
 		action() {
-			$root.closeChannel(channel);
+			closeChannel();
 		},
 	});
 
 	return items;
 }
 
-export function generateInlineChannelContextMenu($root, chan, network) {
+export function generateInlineChannelContextMenu(
+	store: TypedStore,
+	chan: string,
+	network: ClientNetwork
+): ContextMenuItem[] {
 	const join = () => {
 		const channel = network.channels.find((c) => c.name === chan);
 
 		if (channel) {
-			$root.switchToChannel(channel);
+			switchToChannel(channel);
 		}
 
 		socket.emit("input", {
-			target: $root.$store.state.activeChannel.channel.id,
+			target: store.state.activeChannel.channel.id,
 			text: "/join " + chan,
 		});
 	};
@@ -245,8 +279,13 @@ export function generateInlineChannelContextMenu($root, chan, network) {
 	];
 }
 
-export function generateUserContextMenu($root, channel, network, user) {
-	const currentChannelUser = channel
+export function generateUserContextMenu(
+	store: TypedStore,
+	channel: ClientChan,
+	network: ClientNetwork,
+	user: Pick<ClientUser, "nick" | "modes">
+): ContextMenuItem[] {
+	const currentChannelUser: ClientUser | Record<string, never> = channel
 		? channel.users.find((u) => u.nick === network.nick) || {}
 		: {};
 
@@ -254,7 +293,7 @@ export function generateUserContextMenu($root, channel, network, user) {
 		const chan = network.channels.find((c) => c.name === user.nick);
 
 		if (chan) {
-			$root.switchToChannel(chan);
+			switchToChannel(chan);
 		}
 
 		socket.emit("input", {
@@ -263,7 +302,7 @@ export function generateUserContextMenu($root, channel, network, user) {
 		});
 	};
 
-	const items = [
+	const items: ContextMenuItem[] = [
 		{
 			label: user.nick,
 			type: "item",
@@ -295,10 +334,10 @@ export function generateUserContextMenu($root, channel, network, user) {
 			type: "item",
 			class: "action-query",
 			action() {
-				const chan = $root.$store.getters.findChannelOnCurrentNetwork(user.nick);
+				const chan = store.getters.findChannelOnCurrentNetwork(user.nick);
 
 				if (chan) {
-					$root.switchToChannel(chan);
+					switchToChannel(chan);
 				}
 
 				socket.emit("input", {
@@ -325,13 +364,23 @@ export function generateUserContextMenu($root, channel, network, user) {
 
 	// Labels for the mode changes.  For example .rev({mode: "a", symbol: "&"}) => 'Revoke admin (-a)'
 	const modeTextTemplate = {
-		revoke(m) {
+		revoke(m: {symbol: string; mode: string}) {
 			const name = modeCharToName[m.symbol];
+
+			if (typeof name !== "string") {
+				return "";
+			}
+
 			const res = name ? `Revoke ${name} (-${m.mode})` : `Mode -${m.mode}`;
 			return res;
 		},
-		give(m) {
+		give(m: {symbol: string; mode: string}) {
 			const name = modeCharToName[m.symbol];
+
+			if (typeof name !== "string") {
+				return "";
+			}
+
 			const res = name ? `Give ${name} (+${m.mode})` : `Mode +${m.mode}`;
 			return res;
 		},
@@ -351,7 +400,7 @@ export function generateUserContextMenu($root, channel, network, user) {
 	 *
 	 * @return {boolean} whether p1 can perform an action on p2
 	 */
-	function compare(p1, p2) {
+	function compare(p1: string, p2: string): boolean {
 		// The modes ~ and @ can perform actions on their own mode.  The others on modes below.
 		return "~@".indexOf(p1) > -1
 			? networkModeSymbols.indexOf(p1) <= networkModeSymbols.indexOf(p2)
diff --git a/client/js/helpers/distance.js b/client/js/helpers/distance.js
deleted file mode 100644
index 4a9c01df..00000000
--- a/client/js/helpers/distance.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function distance([x1, y1], [x2, y2]) {
-	return Math.hypot(x1 - x2, y1 - y2);
-}
-
-export default distance;
diff --git a/client/js/helpers/distance.ts b/client/js/helpers/distance.ts
new file mode 100644
index 00000000..8e9db070
--- /dev/null
+++ b/client/js/helpers/distance.ts
@@ -0,0 +1,5 @@
+function distance([x1, y1]: [number, number], [x2, y2]: [number, number]) {
+	return Math.hypot(x1 - x2, y1 - y2);
+}
+
+export default distance;
diff --git a/client/js/helpers/friendlysize.js b/client/js/helpers/friendlysize.ts
similarity index 88%
rename from client/js/helpers/friendlysize.js
rename to client/js/helpers/friendlysize.ts
index a590f442..d29ba73f 100644
--- a/client/js/helpers/friendlysize.js
+++ b/client/js/helpers/friendlysize.ts
@@ -1,8 +1,6 @@
-"use strict";
-
 const sizes = ["Bytes", "KiB", "MiB", "GiB", "TiB", "PiB"];
 
-export default (size) => {
+export default (size: number) => {
 	// Loosely inspired from https://stackoverflow.com/a/18650828/1935861
 	const i = size > 0 ? Math.floor(Math.log(size) / Math.log(1024)) : 0;
 	const fixedSize = parseFloat((size / Math.pow(1024, i)).toFixed(1));
diff --git a/client/js/helpers/ircmessageparser/anyIntersection.js b/client/js/helpers/ircmessageparser/anyIntersection.ts
similarity index 82%
rename from client/js/helpers/ircmessageparser/anyIntersection.js
rename to client/js/helpers/ircmessageparser/anyIntersection.ts
index 557ad945..cf2fd156 100644
--- a/client/js/helpers/ircmessageparser/anyIntersection.js
+++ b/client/js/helpers/ircmessageparser/anyIntersection.ts
@@ -1,8 +1,9 @@
-"use strict";
-
 // Return true if any section of "a" or "b" parts (defined by their start/end
+
+import {Part} from "./merge";
+
 // markers) intersect each other, false otherwise.
-function anyIntersection(a, b) {
+function anyIntersection(a: Part, b: Part) {
 	return (
 		(a.start <= b.start && b.start < a.end) ||
 		(a.start < b.end && b.end <= a.end) ||
diff --git a/client/js/helpers/ircmessageparser/cleanIrcMessage.js b/client/js/helpers/ircmessageparser/cleanIrcMessage.ts
similarity index 60%
rename from client/js/helpers/ircmessageparser/cleanIrcMessage.js
rename to client/js/helpers/ircmessageparser/cleanIrcMessage.ts
index ec7eb7ab..7e4fdf35 100644
--- a/client/js/helpers/ircmessageparser/cleanIrcMessage.js
+++ b/client/js/helpers/ircmessageparser/cleanIrcMessage.ts
@@ -1,6 +1,4 @@
-"use strict";
-
 const matchFormatting =
 	/\x02|\x1D|\x1F|\x16|\x0F|\x11|\x1E|\x03(?:[0-9]{1,2}(?:,[0-9]{1,2})?)?|\x04(?:[0-9a-f]{6}(?:,[0-9a-f]{6})?)?/gi;
 
-module.exports = (message) => message.replace(matchFormatting, "").trim();
+export default (message: string) => message.replace(matchFormatting, "").trim();
diff --git a/client/js/helpers/ircmessageparser/fill.js b/client/js/helpers/ircmessageparser/fill.ts
similarity index 83%
rename from client/js/helpers/ircmessageparser/fill.js
rename to client/js/helpers/ircmessageparser/fill.ts
index 8ae271d4..c9e613f1 100644
--- a/client/js/helpers/ircmessageparser/fill.js
+++ b/client/js/helpers/ircmessageparser/fill.ts
@@ -1,15 +1,16 @@
-"use strict";
-
 // Create plain text entries corresponding to areas of the text that match no
 // existing entries. Returns an empty array if all parts of the text have been
+
+import {Part} from "./merge";
+
 // parsed into recognizable entries already.
-function fill(existingEntries, text) {
+function fill(existingEntries: Part[], text: string) {
 	let position = 0;
 
 	// Fill inner parts of the text. For example, if text is `foobarbaz` and both
 	// `foo` and `baz` have matched into an entry, this will return a dummy entry
 	// corresponding to `bar`.
-	const result = existingEntries.reduce((acc, textSegment) => {
+	const result = existingEntries.reduce<Part[]>((acc, textSegment) => {
 		if (textSegment.start > position) {
 			acc.push({
 				start: position,
diff --git a/client/js/helpers/ircmessageparser/findChannels.js b/client/js/helpers/ircmessageparser/findChannels.ts
similarity index 85%
rename from client/js/helpers/ircmessageparser/findChannels.js
rename to client/js/helpers/ircmessageparser/findChannels.ts
index 044dfcb9..69296b41 100644
--- a/client/js/helpers/ircmessageparser/findChannels.js
+++ b/client/js/helpers/ircmessageparser/findChannels.ts
@@ -1,16 +1,19 @@
-"use strict";
-
 // Escapes the RegExp special characters "^", "$", "", ".", "*", "+", "?", "(",
 // ")", "[", "]", "{", "}", and "|" in string.
 // See https://lodash.com/docs/#escapeRegExp
 import escapeRegExp from "lodash/escapeRegExp";
+import {Part} from "./merge";
+
+export type ChannelPart = Part & {
+	channel: string;
+};
 
 // Given an array of channel prefixes (such as "#" and "&") and an array of user
 // modes (such as "@" and "+"), this function extracts channels and nicks from a
 // text.
 // It returns an array of objects for each channel found with their start index,
 // end index and channel name.
-function findChannels(text, channelPrefixes, userModes) {
+function findChannels(text: string, channelPrefixes: string[], userModes: string[]) {
 	// `userModePattern` is necessary to ignore user modes in /whois responses.
 	// For example, a voiced user in #thelounge will have a /whois response of:
 	// > foo is on the following channels: +#thelounge
@@ -20,8 +23,8 @@ function findChannels(text, channelPrefixes, userModes) {
 	const channelPattern = `(?:^|\\s)[${userModePattern}]*([${channelPrefixPattern}][^ \u0007]+)`;
 	const channelRegExp = new RegExp(channelPattern, "g");
 
-	const result = [];
-	let match;
+	const result: ChannelPart[] = [];
+	let match: RegExpExecArray | null;
 
 	do {
 		// With global ("g") regexes, calling `exec` multiple times will find
diff --git a/client/js/helpers/ircmessageparser/findEmoji.js b/client/js/helpers/ircmessageparser/findEmoji.js
deleted file mode 100644
index 4559c96f..00000000
--- a/client/js/helpers/ircmessageparser/findEmoji.js
+++ /dev/null
@@ -1,20 +0,0 @@
-"use strict";
-
-const emojiRegExp = require("emoji-regex")();
-
-function findEmoji(text) {
-	const result = [];
-	let match;
-
-	while ((match = emojiRegExp.exec(text))) {
-		result.push({
-			start: match.index,
-			end: match.index + match[0].length,
-			emoji: match[0],
-		});
-	}
-
-	return result;
-}
-
-export default findEmoji;
diff --git a/client/js/helpers/ircmessageparser/findEmoji.ts b/client/js/helpers/ircmessageparser/findEmoji.ts
new file mode 100644
index 00000000..7ebc95cc
--- /dev/null
+++ b/client/js/helpers/ircmessageparser/findEmoji.ts
@@ -0,0 +1,25 @@
+import emojiRegExp from "emoji-regex";
+import {Part} from "./merge";
+
+const regExp = emojiRegExp();
+
+export type EmojiPart = Part & {
+	emoji: string;
+};
+
+function findEmoji(text: string) {
+	const result: EmojiPart[] = [];
+	let match: RegExpExecArray | null;
+
+	while ((match = regExp.exec(text))) {
+		result.push({
+			start: match.index,
+			end: match.index + match[0].length,
+			emoji: match[0],
+		});
+	}
+
+	return result;
+}
+
+export default findEmoji;
diff --git a/client/js/helpers/ircmessageparser/findLinks.js b/client/js/helpers/ircmessageparser/findLinks.ts
similarity index 59%
rename from client/js/helpers/ircmessageparser/findLinks.js
rename to client/js/helpers/ircmessageparser/findLinks.ts
index b35a3efe..15c38be9 100644
--- a/client/js/helpers/ircmessageparser/findLinks.js
+++ b/client/js/helpers/ircmessageparser/findLinks.ts
@@ -1,8 +1,15 @@
-"use strict";
+import LinkifyIt, {Match} from "linkify-it";
+import {Part} from "./merge";
 
-const LinkifyIt = require("linkify-it");
+export type LinkPart = Part & {
+	link: string;
+};
 
-LinkifyIt.prototype.normalize = function normalize(match) {
+type OurMatch = Match & {
+	noschema?: boolean;
+};
+
+LinkifyIt.prototype.normalize = function normalize(match: OurMatch) {
 	if (!match.schema) {
 		match.schema = "http:";
 		match.url = "http://" + match.url;
@@ -20,7 +27,8 @@ LinkifyIt.prototype.normalize = function normalize(match) {
 	}
 };
 
-const linkify = LinkifyIt().tlds(require("tlds")).tlds("onion", true);
+import tlds from "tlds";
+const linkify = LinkifyIt().tlds(tlds).tlds("onion", true);
 
 // Known schemes to detect in text
 const commonSchemes = [
@@ -44,8 +52,8 @@ for (const schema of commonSchemes) {
 	linkify.add(schema + ":", "http:");
 }
 
-function findLinks(text) {
-	const matches = linkify.match(text);
+function findLinks(text: string) {
+	const matches = linkify.match(text) as OurMatch[];
 
 	if (!matches) {
 		return [];
@@ -54,8 +62,8 @@ function findLinks(text) {
 	return matches.map(returnUrl);
 }
 
-function findLinksWithSchema(text) {
-	const matches = linkify.match(text);
+function findLinksWithSchema(text: string) {
+	const matches = linkify.match(text) as OurMatch[];
 
 	if (!matches) {
 		return [];
@@ -64,7 +72,7 @@ function findLinksWithSchema(text) {
 	return matches.filter((url) => !url.noschema).map(returnUrl);
 }
 
-function returnUrl(url) {
+function returnUrl(url: OurMatch): LinkPart {
 	return {
 		start: url.index,
 		end: url.lastIndex,
@@ -72,7 +80,4 @@ function returnUrl(url) {
 	};
 }
 
-module.exports = {
-	findLinks,
-	findLinksWithSchema,
-};
+export {findLinks, findLinksWithSchema};
diff --git a/client/js/helpers/ircmessageparser/findNames.js b/client/js/helpers/ircmessageparser/findNames.ts
similarity index 54%
rename from client/js/helpers/ircmessageparser/findNames.js
rename to client/js/helpers/ircmessageparser/findNames.ts
index 58fee254..52b116e3 100644
--- a/client/js/helpers/ircmessageparser/findNames.js
+++ b/client/js/helpers/ircmessageparser/findNames.ts
@@ -1,19 +1,23 @@
-"use strict";
+import {Part} from "./merge";
 
 const nickRegExp = /([\w[\]\\`^{|}-]+)/g;
 
-function findNames(text, users) {
-	const result = [];
+export type NamePart = Part & {
+	nick: string;
+};
+
+function findNames(text: string, nicks: string[]): NamePart[] {
+	const result: NamePart[] = [];
 
 	// Return early if we don't have any nicknames to find
-	if (users.length === 0) {
+	if (nicks.length === 0) {
 		return result;
 	}
 
-	let match;
+	let match: RegExpExecArray | null;
 
 	while ((match = nickRegExp.exec(text))) {
-		if (users.indexOf(match[1]) > -1) {
+		if (nicks.indexOf(match[1]) > -1) {
 			result.push({
 				start: match.index,
 				end: match.index + match[1].length,
diff --git a/client/js/helpers/ircmessageparser/merge.js b/client/js/helpers/ircmessageparser/merge.ts
similarity index 54%
rename from client/js/helpers/ircmessageparser/merge.js
rename to client/js/helpers/ircmessageparser/merge.ts
index 5d22930b..9c728cec 100644
--- a/client/js/helpers/ircmessageparser/merge.js
+++ b/client/js/helpers/ircmessageparser/merge.ts
@@ -1,10 +1,31 @@
-"use strict";
-
 import anyIntersection from "./anyIntersection";
 import fill from "./fill";
+import {ChannelPart} from "./findChannels";
+import {EmojiPart} from "./findEmoji";
+import {LinkPart} from "./findLinks";
+import {NamePart} from "./findNames";
+
+export type Part = {
+	start: number;
+	end: number;
+};
+
+type TextPart = Part & {
+	text: string;
+};
+
+type Fragment = {
+	start: number;
+	end: number;
+	text: string;
+};
+
+type PartWithFragments = Part & {
+	fragments: Fragment[];
+};
 
 // Merge text part information within a styling fragment
-function assign(textPart, fragment) {
+function assign(textPart: Part, fragment: Fragment) {
 	const fragStart = fragment.start;
 	const start = Math.max(fragment.start, textPart.start);
 	const end = Math.min(fragment.end, textPart.end);
@@ -13,10 +34,12 @@ function assign(textPart, fragment) {
 	return Object.assign({}, fragment, {start, end, text});
 }
 
-function sortParts(a, b) {
+function sortParts(a: Part, b: Part) {
 	return a.start - b.start || b.end - a.end;
 }
 
+export type MergedParts = (TextPart | NamePart | EmojiPart | ChannelPart | LinkPart)[];
+
 // Merge the style fragments within the text parts, taking into account
 // boundaries and text sections that have not matched to links or channels.
 // For example, given a string "foobar" where "foo" and "bar" have been
@@ -24,9 +47,13 @@ function sortParts(a, b) {
 // different styles, the first resulting part will contain fragments "fo" and
 // "o", and the second resulting part will contain "b" and "ar". "o" and "b"
 // fragments will contain duplicate styling attributes.
-function merge(textParts, styleFragments, cleanText) {
+function merge(
+	parts: MergedParts,
+	styleFragments: Fragment[],
+	cleanText: string
+): PartWithFragments[] {
 	// Remove overlapping parts
-	textParts = textParts.sort(sortParts).reduce((prev, curr) => {
+	parts = parts.sort(sortParts).reduce<MergedParts>((prev, curr) => {
 		const intersection = prev.some((p) => anyIntersection(p, curr));
 
 		if (intersection) {
@@ -39,15 +66,17 @@ function merge(textParts, styleFragments, cleanText) {
 	// Every section of the original text that has not been captured in a "part"
 	// is filled with "text" parts, dummy objects with start/end but no extra
 	// metadata.
-	const allParts = textParts.concat(fill(textParts, cleanText)).sort(sortParts); // Sort all parts identified based on their position in the original text
+
+	const filled = fill(parts, cleanText) as TextPart[];
+	const allParts: MergedParts = [...parts, ...filled].sort(sortParts); // Sort all parts identified based on their position in the original text
 
 	// Distribute the style fragments within the text parts
-	return allParts.map((textPart) => {
-		textPart.fragments = styleFragments
-			.filter((fragment) => anyIntersection(textPart, fragment))
-			.map((fragment) => assign(textPart, fragment));
+	return allParts.map((part: any) => {
+		part.fragments = styleFragments
+			.filter((fragment) => anyIntersection(part, fragment))
+			.map((fragment) => assign(part, fragment));
 
-		return textPart;
+		return part as PartWithFragments;
 	});
 }
 
diff --git a/client/js/helpers/ircmessageparser/parseStyle.js b/client/js/helpers/ircmessageparser/parseStyle.ts
similarity index 93%
rename from client/js/helpers/ircmessageparser/parseStyle.js
rename to client/js/helpers/ircmessageparser/parseStyle.ts
index ccf5293a..ea4d4bd3 100644
--- a/client/js/helpers/ircmessageparser/parseStyle.js
+++ b/client/js/helpers/ircmessageparser/parseStyle.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 // Styling control codes
 const BOLD = "\x02";
 const COLOR = "\x03";
@@ -11,6 +9,21 @@ const UNDERLINE = "\x1f";
 const STRIKETHROUGH = "\x1e";
 const MONOSPACE = "\x11";
 
+export type ParsedStyle = {
+	bold?: boolean;
+	textColor?: string;
+	bgColor?: string;
+	hexColor?: string;
+	hexBgColor?: string;
+	italic?: boolean;
+	underline?: boolean;
+	strikethrough?: boolean;
+	monospace?: boolean;
+	text: string;
+	start: number;
+	end: number;
+};
+
 // Color code matcher, with format `XX,YY` where both `XX` and `YY` are
 // integers, `XX` is the text color and `YY` is an optional background color.
 const colorRx = /^(\d{1,2})(?:,(\d{1,2}))?/;
@@ -26,8 +39,8 @@ const controlCodesRx = /[\u0000-\u0009\u000B-\u001F]/g;
 // similarly styled section of the text. Each object carries the `text`, style
 // information (`bold`, `textColor`, `bgcolor`, `italic`,
 // `underline`, `strikethrough`, `monospace`), and `start`/`end` cursors.
-function parseStyle(text) {
-	const result = [];
+function parseStyle(text: string) {
+	const result: ParsedStyle[] = [];
 	let start = 0;
 	let position = 0;
 
@@ -213,12 +226,12 @@ const properties = [
 	"monospace",
 ];
 
-function prepare(text) {
+function prepare(text: string) {
 	return (
 		parseStyle(text)
 			// This optimizes fragments by combining them together when all their values
 			// for the properties defined above are equal.
-			.reduce((prev, curr) => {
+			.reduce((prev: ParsedStyle[], curr) => {
 				if (prev.length) {
 					const lastEntry = prev[prev.length - 1];
 
diff --git a/client/js/helpers/isChannelCollapsed.js b/client/js/helpers/isChannelCollapsed.ts
similarity index 85%
rename from client/js/helpers/isChannelCollapsed.js
rename to client/js/helpers/isChannelCollapsed.ts
index 5c49da1b..59e0b631 100644
--- a/client/js/helpers/isChannelCollapsed.js
+++ b/client/js/helpers/isChannelCollapsed.ts
@@ -1,6 +1,4 @@
-"use strict";
-
-import store from "../store";
+import {store} from "../store";
 
 export default (network, channel) => {
 	if (!network.isCollapsed || channel.highlight || channel.type === "lobby") {
diff --git a/client/js/helpers/isIgnoredKeybind.js b/client/js/helpers/isIgnoredKeybind.js
deleted file mode 100644
index 7edef49d..00000000
--- a/client/js/helpers/isIgnoredKeybind.js
+++ /dev/null
@@ -1,12 +0,0 @@
-"use strict";
-
-export default (event) => {
-	if (event.target.tagName !== "TEXTAREA" && event.target.tagName !== "INPUT") {
-		return false;
-	}
-
-	// If focus is in a textarea, do not handle keybinds if user has typed anything
-	// This is done to prevent keyboard layout binds conflicting with ours
-	// For example alt+shift+left on macos selects a word
-	return !!event.target.value;
-};
diff --git a/client/js/helpers/isIgnoredKeybind.ts b/client/js/helpers/isIgnoredKeybind.ts
new file mode 100644
index 00000000..0f0ab513
--- /dev/null
+++ b/client/js/helpers/isIgnoredKeybind.ts
@@ -0,0 +1,13 @@
+export default (event: MouseEvent | Mousetrap.ExtendedKeyboardEvent) => {
+	if (
+		(event.target as HTMLElement).tagName !== "TEXTAREA" &&
+		(event.target as HTMLElement).tagName !== "INPUT"
+	) {
+		return false;
+	}
+
+	// If focus is in a textarea, do not handle keybinds if user has typed anything
+	// This is done to prevent keyboard layout binds conflicting with ours
+	// For example alt+shift+left on macos selects a word
+	return !!(event.target as any).value;
+};
diff --git a/client/js/helpers/listenForTwoFingerSwipes.js b/client/js/helpers/listenForTwoFingerSwipes.ts
similarity index 95%
rename from client/js/helpers/listenForTwoFingerSwipes.js
rename to client/js/helpers/listenForTwoFingerSwipes.ts
index 048b4188..de920e21 100644
--- a/client/js/helpers/listenForTwoFingerSwipes.js
+++ b/client/js/helpers/listenForTwoFingerSwipes.ts
@@ -1,11 +1,12 @@
-"use strict";
-
 import distance from "./distance";
 
 // onTwoFingerSwipe will be called with a cardinal direction ("n", "e", "s" or
 // "w") as its only argument.
 function listenForTwoFingerSwipes(onTwoFingerSwipe) {
-	let history = [];
+	let history: {
+		center: number[];
+		timestamp: number;
+	}[] = [];
 
 	document.body.addEventListener(
 		"touchmove",
@@ -17,6 +18,10 @@ function listenForTwoFingerSwipes(onTwoFingerSwipe) {
 			const a = event.touches.item(0);
 			const b = event.touches.item(1);
 
+			if (!a || !b) {
+				return;
+			}
+
 			const timestamp = window.performance.now();
 			const center = [(a.screenX + b.screenX) / 2, (a.screenY + b.screenY) / 2];
 
diff --git a/client/js/helpers/localetime.js b/client/js/helpers/localetime.js
deleted file mode 100644
index 74b7546f..00000000
--- a/client/js/helpers/localetime.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-import dayjs from "dayjs";
-
-export default (time) => dayjs(time).format("D MMMM YYYY, HH:mm:ss");
diff --git a/client/js/helpers/localetime.ts b/client/js/helpers/localetime.ts
new file mode 100644
index 00000000..91924f93
--- /dev/null
+++ b/client/js/helpers/localetime.ts
@@ -0,0 +1,3 @@
+import dayjs from "dayjs";
+
+export default (time: Date | number) => dayjs(time).format("D MMMM YYYY, HH:mm:ss");
diff --git a/client/js/helpers/parse.js b/client/js/helpers/parse.ts
similarity index 65%
rename from client/js/helpers/parse.js
rename to client/js/helpers/parse.ts
index 675dd0b0..b120d70f 100644
--- a/client/js/helpers/parse.js
+++ b/client/js/helpers/parse.ts
@@ -1,22 +1,43 @@
-"use strict";
+// TODO: type
+// @ts-nocheck
 
+import {h as createElement, VNode} from "vue";
 import parseStyle from "./ircmessageparser/parseStyle";
-import findChannels from "./ircmessageparser/findChannels";
-import {findLinks} from "./ircmessageparser/findLinks";
-import findEmoji from "./ircmessageparser/findEmoji";
-import findNames from "./ircmessageparser/findNames";
-import merge from "./ircmessageparser/merge";
+import findChannels, {ChannelPart} from "./ircmessageparser/findChannels";
+import {findLinks, LinkPart} from "./ircmessageparser/findLinks";
+import findEmoji, {EmojiPart} from "./ircmessageparser/findEmoji";
+import findNames, {NamePart} from "./ircmessageparser/findNames";
+import merge, {MergedParts, Part} from "./ircmessageparser/merge";
 import emojiMap from "./fullnamemap.json";
 import LinkPreviewToggle from "../../components/LinkPreviewToggle.vue";
 import LinkPreviewFileSize from "../../components/LinkPreviewFileSize.vue";
 import InlineChannel from "../../components/InlineChannel.vue";
 import Username from "../../components/Username.vue";
+import {ClientMessage, ClientNetwork} from "../types";
 
 const emojiModifiersRegex = /[\u{1f3fb}-\u{1f3ff}]|\u{fe0f}/gu;
 
+type Fragment = {
+	class?: string[];
+	text?: string;
+};
+
+type StyledFragment = Fragment & {
+	textColor?: string;
+	bgColor?: string;
+	hexColor?: string;
+	hexBgColor?: string;
+
+	bold?: boolean;
+	italic?: boolean;
+	underline?: boolean;
+	monospace?: boolean;
+	strikethrough?: boolean;
+};
+
 // Create an HTML `span` with styling information for a given fragment
-function createFragment(fragment, createElement) {
-	const classes = [];
+function createFragment(fragment: StyledFragment): VNode | string | undefined {
+	const classes: string[] = [];
 
 	if (fragment.bold) {
 		classes.push("irc-bold");
@@ -46,7 +67,14 @@ function createFragment(fragment, createElement) {
 		classes.push("irc-monospace");
 	}
 
-	const data = {};
+	const data: {
+		class?: string[];
+		style?: Record<string, string>;
+	} = {
+		class: undefined,
+		style: undefined,
+	};
+
 	let hasData = false;
 
 	if (classes.length > 0) {
@@ -70,7 +98,7 @@ function createFragment(fragment, createElement) {
 
 // Transform an IRC message potentially filled with styling control codes, URLs,
 // nicknames, and channels into a string of HTML elements to display on the client.
-function parse(createElement, text, message = undefined, network = undefined) {
+function parse(text: string, message?: ClientMessage, network?: ClientNetwork) {
 	// Extract the styling information and get the plain text version from it
 	const styleFragments = parseStyle(text);
 	const cleanText = styleFragments.map((fragment) => fragment.text).join("");
@@ -79,23 +107,23 @@ function parse(createElement, text, message = undefined, network = undefined) {
 	// arrays of objects containing start and end markers, as well as metadata
 	// depending on what was found (channel or link).
 	const channelPrefixes = network ? network.serverOptions.CHANTYPES : ["#", "&"];
-	const userModes = network?.serverOptions?.PREFIX.symbols || ["!", "@", "%", "+"];
+	const userModes = network
+		? network.serverOptions.PREFIX?.prefix?.map((pref) => pref.symbol)
+		: ["!", "@", "%", "+"];
 	const channelParts = findChannels(cleanText, channelPrefixes, userModes);
 	const linkParts = findLinks(cleanText);
 	const emojiParts = findEmoji(cleanText);
 	const nameParts = findNames(cleanText, message ? message.users || [] : []);
 
-	const parts = channelParts.concat(linkParts).concat(emojiParts).concat(nameParts);
-
-	// The channel the message belongs to might not exist if the user isn't joined to it.
-	const messageChannel = message ? message.channel : null;
+	const parts = (channelParts as MergedParts)
+		.concat(linkParts)
+		.concat(emojiParts)
+		.concat(nameParts);
 
 	// Merge the styling information with the channels / URLs / nicks / text objects and
 	// generate HTML strings with the resulting fragments
 	return merge(parts, styleFragments, cleanText).map((textPart) => {
-		const fragments = textPart.fragments.map((fragment) =>
-			createFragment(fragment, createElement)
-		);
+		const fragments = textPart.fragments.map((fragment) => createFragment(fragment));
 
 		// Wrap these potentially styled fragments with links and channel buttons
 		if (textPart.link) {
@@ -106,12 +134,10 @@ function parse(createElement, text, message = undefined, network = undefined) {
 			const link = createElement(
 				"a",
 				{
-					attrs: {
-						href: textPart.link,
-						dir: preview ? null : "auto",
-						target: "_blank",
-						rel: "noopener",
-					},
+					href: textPart.link,
+					dir: preview ? null : "auto",
+					target: "_blank",
+					rel: "noopener",
 				},
 				fragments
 			);
@@ -125,18 +151,15 @@ function parse(createElement, text, message = undefined, network = undefined) {
 			if (preview.size > 0) {
 				linkEls.push(
 					createElement(LinkPreviewFileSize, {
-						props: {
-							size: preview.size,
-						},
+						size: preview.size,
 					})
 				);
 			}
 
 			linkEls.push(
 				createElement(LinkPreviewToggle, {
-					props: {
-						link: preview,
-					},
+					link: preview,
+					message: message,
 				})
 			);
 
@@ -145,9 +168,7 @@ function parse(createElement, text, message = undefined, network = undefined) {
 			return createElement(
 				"span",
 				{
-					attrs: {
-						dir: "auto",
-					},
+					dir: "auto",
 				},
 				linkEls
 			);
@@ -155,27 +176,26 @@ function parse(createElement, text, message = undefined, network = undefined) {
 			return createElement(
 				InlineChannel,
 				{
-					props: {
-						channel: textPart.channel,
-					},
+					channel: textPart.channel,
 				},
-				fragments
+				{
+					default: () => fragments,
+				}
 			);
 		} else if (textPart.emoji) {
 			const emojiWithoutModifiers = textPart.emoji.replace(emojiModifiersRegex, "");
 			const title = emojiMap[emojiWithoutModifiers]
-				? `Emoji: ${emojiMap[emojiWithoutModifiers]}`
+				? // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+				  `Emoji: ${emojiMap[emojiWithoutModifiers]}`
 				: null;
 
 			return createElement(
 				"span",
 				{
 					class: ["emoji"],
-					attrs: {
-						role: "img",
-						"aria-label": title,
-						title: title,
-					},
+					role: "img",
+					"aria-label": title,
+					title: title,
 				},
 				fragments
 			);
@@ -183,18 +203,14 @@ function parse(createElement, text, message = undefined, network = undefined) {
 			return createElement(
 				Username,
 				{
-					props: {
-						user: {
-							nick: textPart.nick,
-						},
-						channel: messageChannel,
-						network,
-					},
-					attrs: {
-						dir: "auto",
+					user: {
+						nick: textPart.nick,
 					},
+					dir: "auto",
 				},
-				fragments
+				{
+					default: () => fragments,
+				}
 			);
 		}
 
diff --git a/client/js/helpers/parseIrcUri.js b/client/js/helpers/parseIrcUri.ts
similarity index 95%
rename from client/js/helpers/parseIrcUri.js
rename to client/js/helpers/parseIrcUri.ts
index 9ed09073..22ed3c56 100644
--- a/client/js/helpers/parseIrcUri.js
+++ b/client/js/helpers/parseIrcUri.ts
@@ -1,6 +1,4 @@
-"use strict";
-
-export default (stringUri) => {
+export default (stringUri: string) => {
 	const data = {};
 
 	try {
diff --git a/client/js/helpers/roundBadgeNumber.js b/client/js/helpers/roundBadgeNumber.ts
similarity index 71%
rename from client/js/helpers/roundBadgeNumber.js
rename to client/js/helpers/roundBadgeNumber.ts
index 77cdb6e5..dd7b6fdc 100644
--- a/client/js/helpers/roundBadgeNumber.js
+++ b/client/js/helpers/roundBadgeNumber.ts
@@ -1,6 +1,4 @@
-"use strict";
-
-export default (count) => {
+export default (count: number) => {
 	if (count < 1000) {
 		return count.toString();
 	}
diff --git a/client/js/hooks/use-close-channel.ts b/client/js/hooks/use-close-channel.ts
new file mode 100644
index 00000000..26bf82dc
--- /dev/null
+++ b/client/js/hooks/use-close-channel.ts
@@ -0,0 +1,38 @@
+import eventbus from "../eventbus";
+import socket from "../socket";
+import {ClientChan} from "../types";
+
+export default function useCloseChannel(channel: ClientChan) {
+	return () => {
+		if (channel.type === "lobby") {
+			eventbus.emit(
+				"confirm-dialog",
+				{
+					title: "Remove network",
+					text: `Are you sure you want to quit and remove ${channel.name}? This cannot be undone.`,
+					button: "Remove network",
+				},
+				(result: boolean) => {
+					if (!result) {
+						return;
+					}
+
+					channel.closed = true;
+					socket.emit("input", {
+						target: Number(channel.id),
+						text: "/quit",
+					});
+				}
+			);
+
+			return;
+		}
+
+		channel.closed = true;
+
+		socket.emit("input", {
+			target: Number(channel.id),
+			text: "/close",
+		});
+	};
+}
diff --git a/client/js/keybinds.js b/client/js/keybinds.ts
similarity index 87%
rename from client/js/keybinds.js
rename to client/js/keybinds.ts
index 2fbb3311..c4736772 100644
--- a/client/js/keybinds.js
+++ b/client/js/keybinds.ts
@@ -1,12 +1,11 @@
-"use strict";
-
 import Mousetrap from "mousetrap";
 
-import store from "./store";
+import {store} from "./store";
 import {switchToChannel, router, navigate} from "./router";
 import isChannelCollapsed from "./helpers/isChannelCollapsed";
 import isIgnoredKeybind from "./helpers/isIgnoredKeybind";
 import listenForTwoFingerSwipes from "./helpers/listenForTwoFingerSwipes";
+import {ClientChan} from "./types";
 
 // Switch to the next/previous window in the channel list.
 Mousetrap.bind(["alt+up", "alt+down"], function (e, keys) {
@@ -19,18 +18,18 @@ Mousetrap.bind(["alt+up", "alt+down"], function (e, keys) {
 	return false;
 });
 
-listenForTwoFingerSwipes(function (cardinalDirection) {
+listenForTwoFingerSwipes(function (cardinalDirection: string) {
 	if (cardinalDirection === "e" || cardinalDirection === "w") {
 		navigateWindow(cardinalDirection === "e" ? -1 : 1);
 	}
 });
 
-function navigateWindow(direction) {
+function navigateWindow(direction: number) {
 	if (store.state.networks.length === 0) {
 		return;
 	}
 
-	const flatChannels = [];
+	const flatChannels: ClientChan[] = [];
 	let index = -1;
 
 	for (const network of store.state.networks) {
@@ -39,11 +38,7 @@ function navigateWindow(direction) {
 				continue;
 			}
 
-			if (
-				index === -1 &&
-				store.state.activeChannel &&
-				store.state.activeChannel.channel === channel
-			) {
+			if (index === -1 && store.state.activeChannel?.channel === channel) {
 				index = flatChannels.length;
 			}
 
@@ -75,10 +70,10 @@ Mousetrap.bind(["alt+shift+up", "alt+shift+down"], function (e, keys) {
 
 	// If we're in another window, jump to first lobby
 	if (store.state.activeChannel) {
-		index = store.state.networks.findIndex((n) => n === store.state.activeChannel.network);
+		index = store.state.networks.findIndex((n) => n === store.state.activeChannel?.network);
 
 		// If we're in a channel, and it's not the lobby, jump to lobby of this network when going up
-		if (direction !== -1 || store.state.activeChannel.channel.type === "lobby") {
+		if (direction !== -1 || store.state.activeChannel?.channel.type === "lobby") {
 			index = (((index + direction) % length) + length) % length;
 		}
 	}
@@ -118,17 +113,17 @@ Mousetrap.bind(["alt+a"], function (e) {
 });
 
 // Show the help menu.
-Mousetrap.bind(["alt+/"], function (e) {
+Mousetrap.bind(["alt+/"], async function (e) {
 	if (isIgnoredKeybind(e)) {
 		return true;
 	}
 
-	navigate("Help");
+	await navigate("Help");
 
 	return false;
 });
 
-function jumpToChannel(targetChannel) {
+function jumpToChannel(targetChannel: ClientChan) {
 	switchToChannel(targetChannel);
 
 	const element = document.querySelector(
@@ -178,7 +173,7 @@ const ignoredKeys = {
 
 document.addEventListener("keydown", (e) => {
 	// Allow navigating back to the previous page when on the help screen.
-	if (e.key === "Escape" && router.currentRoute.name === "Help") {
+	if (e.key === "Escape" && router.currentRoute.value.name === "Help") {
 		router.go(-1);
 		return;
 	}
@@ -199,13 +194,13 @@ document.addEventListener("keydown", (e) => {
 		const chat = document.querySelector(".window .chat-content .chat");
 
 		if (chat) {
-			chat.focus();
+			(chat as HTMLDivElement).focus();
 		}
 
 		return;
 	}
 
-	const tagName = e.target.tagName;
+	const tagName = (e.target as HTMLElement).tagName;
 
 	// Ignore if we're already typing into <input> or <textarea>
 	if (tagName === "INPUT" || tagName === "TEXTAREA") {
diff --git a/client/js/loading-error-handlers.js b/client/js/loading-error-handlers.js
index d7a7bf94..237e35a4 100644
--- a/client/js/loading-error-handlers.js
+++ b/client/js/loading-error-handlers.js
@@ -1,4 +1,3 @@
-/* eslint strict: 0 */
 "use strict";
 
 /*
@@ -10,11 +9,12 @@
 
 (function () {
 	const msg = document.getElementById("loading-page-message");
-	msg.textContent = "Loading the app…";
 
-	document
-		.getElementById("loading-reload")
-		.addEventListener("click", () => location.reload(true));
+	if (msg) {
+		msg.textContent = "Loading the app…";
+	}
+
+	document.getElementById("loading-reload")?.addEventListener("click", () => location.reload());
 
 	const displayReload = () => {
 		const loadingReload = document.getElementById("loading-reload");
@@ -26,11 +26,22 @@
 
 	const loadingSlowTimeout = setTimeout(() => {
 		const loadingSlow = document.getElementById("loading-slow");
-		loadingSlow.style.visibility = "visible";
+
+		if (loadingSlow) {
+			loadingSlow.style.visibility = "visible";
+		}
+
 		displayReload();
 	}, 5000);
 
+	/**
+	 * @param {ErrorEvent} e
+	 **/
 	const errorHandler = (e) => {
+		if (!msg) {
+			return;
+		}
+
 		msg.textContent = "An error has occurred that prevented the client from loading correctly.";
 
 		const summary = document.createElement("summary");
@@ -46,7 +57,7 @@
 		details.appendChild(summary);
 		details.appendChild(data);
 		details.appendChild(info);
-		msg.parentNode.insertBefore(details, msg.nextSibling);
+		msg.parentNode?.insertBefore(details, msg.nextSibling);
 
 		window.clearTimeout(loadingSlowTimeout);
 		displayReload();
@@ -58,27 +69,37 @@
 		delete window.g_TheLoungeRemoveLoading;
 		window.clearTimeout(loadingSlowTimeout);
 		window.removeEventListener("error", errorHandler);
-		document.getElementById("loading").remove();
+		document.getElementById("loading")?.remove();
 	};
 
 	// Apply user theme as soon as possible, before any other code loads
 	// This prevents flash of white while other code loads and socket connects
 	try {
-		const userSettings = JSON.parse(localStorage.getItem("settings"));
+		const userSettings = JSON.parse(localStorage.getItem("settings") || "{}");
 		const themeEl = document.getElementById("theme");
 
+		if (!themeEl) {
+			return;
+		}
+
 		if (
 			typeof userSettings.theme === "string" &&
-			themeEl.dataset.serverTheme !== userSettings.theme
+			themeEl?.dataset.serverTheme !== userSettings.theme
 		) {
-			themeEl.attributes.href.value = `themes/${userSettings.theme}.css`;
+			themeEl.setAttribute("href", `themes/${userSettings.theme}.css`);
 		}
 
 		if (
 			typeof userSettings.userStyles === "string" &&
 			!/[?&]nocss/.test(window.location.search)
 		) {
-			document.getElementById("user-specified-css").innerHTML = userSettings.userStyles;
+			const userSpecifiedCSSElement = document.getElementById("user-specified-css");
+
+			if (!userSpecifiedCSSElement) {
+				return;
+			}
+
+			userSpecifiedCSSElement.innerHTML = userSettings.userStyles;
 		}
 	} catch (e) {
 		//
@@ -89,8 +110,10 @@
 		navigator.serviceWorker.register("service-worker.js");
 
 		// Handler for messages coming from the service worker
-		const messageHandler = (event) => {
+
+		const messageHandler = (/** @type {MessageEvent} */ event) => {
 			if (event.data.type === "fetch-error") {
+				// @ts-expect-error Argument of type '{ message: string; }' is not assignable to parameter of type 'ErrorEvent'.
 				errorHandler({
 					message: `Service worker failed to fetch an url: ${event.data.message}`,
 				});
diff --git a/client/js/localStorage.js b/client/js/localStorage.ts
similarity index 92%
rename from client/js/localStorage.js
rename to client/js/localStorage.ts
index 709ada0e..07984740 100644
--- a/client/js/localStorage.js
+++ b/client/js/localStorage.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 // This is a simple localStorage wrapper because browser can throw errors
 // in different situations, including:
 // - Unable to store data if storage is full
@@ -11,14 +9,14 @@
 // https://www.chromium.org/for-testers/bug-reporting-guidelines/uncaught-securityerror-failed-to-read-the-localstorage-property-from-window-access-is-denied-for-this-document
 
 export default {
-	set(key, value) {
+	set(key: string, value: string) {
 		try {
 			window.localStorage.setItem(key, value);
 		} catch (e) {
 			//
 		}
 	},
-	get(key) {
+	get(key: string) {
 		try {
 			return window.localStorage.getItem(key);
 		} catch (e) {
@@ -26,7 +24,7 @@ export default {
 			return null;
 		}
 	},
-	remove(key) {
+	remove(key: string) {
 		try {
 			window.localStorage.removeItem(key);
 		} catch (e) {
diff --git a/client/js/location.js b/client/js/location.ts
similarity index 93%
rename from client/js/location.js
rename to client/js/location.ts
index cf490ee5..7b2faaf0 100644
--- a/client/js/location.js
+++ b/client/js/location.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 // This is a thin wrapper around `window.location`, in order to contain the
 // side-effects. Do not add logic to it as it cannot be tested, only mocked.
 export default {
diff --git a/client/js/router.js b/client/js/router.ts
similarity index 78%
rename from client/js/router.js
rename to client/js/router.ts
index 85efb055..c5e2879e 100644
--- a/client/js/router.js
+++ b/client/js/router.ts
@@ -1,12 +1,6 @@
-"use strict";
-
-const constants = require("./constants");
-
-import Vue from "vue";
-import VueRouter from "vue-router";
-
-Vue.use(VueRouter);
+import constants from "./constants";
 
+import {createRouter, createWebHashHistory} from "vue-router";
 import SignIn from "../components/Windows/SignIn.vue";
 import Connect from "../components/Windows/Connect.vue";
 import Settings from "../components/Windows/Settings.vue";
@@ -15,14 +9,16 @@ import Changelog from "../components/Windows/Changelog.vue";
 import NetworkEdit from "../components/Windows/NetworkEdit.vue";
 import SearchResults from "../components/Windows/SearchResults.vue";
 import RoutedChat from "../components/RoutedChat.vue";
-import store from "./store";
+import {store} from "./store";
 
 import AppearanceSettings from "../components/Settings/Appearance.vue";
 import GeneralSettings from "../components/Settings/General.vue";
 import AccountSettings from "../components/Settings/Account.vue";
 import NotificationSettings from "../components/Settings/Notifications.vue";
+import {ClientChan} from "./types";
 
-const router = new VueRouter({
+const router = createRouter({
+	history: createWebHashHistory(),
 	routes: [
 		{
 			name: "SignIn",
@@ -62,6 +58,7 @@ const router = new VueRouter({
 					name: "Account",
 					path: "account",
 					component: AccountSettings,
+					props: true,
 				},
 				{
 					name: "Notifications",
@@ -127,21 +124,7 @@ router.beforeEach((to, from, next) => {
 	}
 
 	// Disallow navigating to invalid networks
-	if (to.name === "NetworkEdit" && !store.getters.findNetwork(to.params.uuid)) {
-		next(false);
-		return;
-	}
-
-	// Handle closing image viewer with the browser back button
-	if (!router.app.$refs.app) {
-		next();
-		return;
-	}
-
-	const imageViewer = router.app.$root.$refs.app.$refs.imageViewer;
-
-	if (imageViewer && imageViewer.link) {
-		imageViewer.closeViewer();
+	if (to.name === "NetworkEdit" && !store.getters.findNetwork(String(to.params.uuid))) {
 		next(false);
 		return;
 	}
@@ -160,40 +143,41 @@ router.afterEach((to) => {
 		const channel = store.state.activeChannel.channel;
 
 		if (to.name !== "RoutedChat") {
-			store.commit("activeChannel", null);
+			store.commit("activeChannel", undefined);
 		}
 
 		// When switching out of a channel, mark everything as read
-		if (channel.messages.length > 0) {
+		if (channel.messages?.length > 0) {
 			channel.firstUnread = channel.messages[channel.messages.length - 1].id;
 		}
 
-		if (channel.messages.length > 100) {
+		if (channel.messages?.length > 100) {
 			channel.messages.splice(0, channel.messages.length - 100);
 			channel.moreHistoryAvailable = true;
 		}
 	}
 });
 
-function navigate(routeName, params = {}) {
-	if (router.currentRoute.name) {
-		router.push({name: routeName, params}).catch(() => {});
+async function navigate(routeName: string, params: any = {}) {
+	if (router.currentRoute.value.name) {
+		await router.push({name: routeName, params});
 	} else {
 		// If current route is null, replace the history entry
 		// This prevents invalid entries from lingering in history,
 		// and then the route guard preventing proper navigation
-		router.replace({name: routeName, params}).catch(() => {});
+		// eslint-disable-next-line @typescript-eslint/no-empty-function
+		await router.replace({name: routeName, params}).catch(() => {});
 	}
 }
 
-function switchToChannel(channel) {
-	return navigate("RoutedChat", {id: channel.id});
+function switchToChannel(channel: ClientChan) {
+	void navigate("RoutedChat", {id: channel.id});
 }
 
 if ("serviceWorker" in navigator) {
 	navigator.serviceWorker.addEventListener("message", (event) => {
 		if (event.data && event.data.type === "open") {
-			const id = parseInt(event.data.channel.substr(5), 10); // remove "chan-" prefix
+			const id = parseInt(event.data.channel.substring(5), 10); // remove "chan-" prefix
 
 			const channelTarget = store.getters.findChannel(id);
 
diff --git a/client/js/settings.js b/client/js/settings.js
deleted file mode 100644
index 3e3e5581..00000000
--- a/client/js/settings.js
+++ /dev/null
@@ -1,135 +0,0 @@
-import socket from "./socket";
-
-const defaultSettingConfig = {
-	apply() {},
-	default: null,
-	sync: null,
-};
-
-export const config = normalizeConfig({
-	syncSettings: {
-		default: true,
-		sync: "never",
-		apply(store, value, auto = false) {
-			// If applied by settings/applyAll, do not emit to server
-			if (value && !auto) {
-				socket.emit("setting:get");
-			}
-		},
-	},
-	advanced: {
-		default: false,
-	},
-	autocomplete: {
-		default: true,
-	},
-	nickPostfix: {
-		default: "",
-	},
-	coloredNicks: {
-		default: true,
-	},
-	desktopNotifications: {
-		default: false,
-		sync: "never",
-		apply(store, value) {
-			store.commit("refreshDesktopNotificationState", null, {root: true});
-
-			if ("Notification" in window && value && Notification.permission !== "granted") {
-				Notification.requestPermission(() =>
-					store.commit("refreshDesktopNotificationState", null, {root: true})
-				);
-			}
-		},
-	},
-	highlights: {
-		default: "",
-		sync: "always",
-	},
-	highlightExceptions: {
-		default: "",
-		sync: "always",
-	},
-	awayMessage: {
-		default: "",
-		sync: "always",
-	},
-	links: {
-		default: true,
-	},
-	motd: {
-		default: true,
-	},
-	notification: {
-		default: true,
-		sync: "never",
-	},
-	notifyAllMessages: {
-		default: false,
-	},
-	showSeconds: {
-		default: false,
-	},
-	use12hClock: {
-		default: false,
-	},
-	statusMessages: {
-		default: "condensed",
-	},
-	theme: {
-		default: document.getElementById("theme").dataset.serverTheme,
-		apply(store, value) {
-			const themeEl = document.getElementById("theme");
-			const themeUrl = `themes/${value}.css`;
-
-			if (themeEl.attributes.href.value === themeUrl) {
-				return;
-			}
-
-			themeEl.attributes.href.value = themeUrl;
-			const newTheme = store.state.serverConfiguration.themes.filter(
-				(theme) => theme.name === value
-			)[0];
-			const themeColor =
-				newTheme.themeColor || document.querySelector('meta[name="theme-color"]').content;
-			document.querySelector('meta[name="theme-color"]').content = themeColor;
-		},
-	},
-	media: {
-		default: true,
-	},
-	uploadCanvas: {
-		default: true,
-	},
-	userStyles: {
-		default: "",
-		apply(store, value) {
-			if (!/[?&]nocss/.test(window.location.search)) {
-				document.getElementById("user-specified-css").innerHTML = value;
-			}
-		},
-	},
-	searchEnabled: {
-		default: false,
-	},
-});
-
-export function createState() {
-	const state = {};
-
-	for (const settingName in config) {
-		state[settingName] = config[settingName].default;
-	}
-
-	return state;
-}
-
-function normalizeConfig(obj) {
-	const newConfig = {};
-
-	for (const settingName in obj) {
-		newConfig[settingName] = {...defaultSettingConfig, ...obj[settingName]};
-	}
-
-	return newConfig;
-}
diff --git a/client/js/settings.ts b/client/js/settings.ts
new file mode 100644
index 00000000..26309b37
--- /dev/null
+++ b/client/js/settings.ts
@@ -0,0 +1,176 @@
+import socket from "./socket";
+import type {TypedStore} from "./store";
+
+const defaultSettingConfig = {
+	// eslint-disable-next-line @typescript-eslint/no-empty-function
+	apply() {},
+	default: null,
+	sync: null,
+};
+
+const defaultConfig = {
+	syncSettings: {
+		default: true,
+		sync: "never",
+		apply(store: TypedStore, value: boolean, auto = false) {
+			// If applied by settings/applyAll, do not emit to server
+			if (value && !auto) {
+				socket.emit("setting:get");
+			}
+		},
+	},
+	advanced: {
+		default: false,
+	},
+	autocomplete: {
+		default: true,
+	},
+	nickPostfix: {
+		default: "",
+	},
+	coloredNicks: {
+		default: true,
+	},
+	desktopNotifications: {
+		default: false,
+		sync: "never",
+		apply(store: TypedStore, value: boolean) {
+			// Commit a mutation. options can have root: true that allows to commit root mutations in namespaced modules.
+			// https://vuex.vuejs.org/api/#store-instance-methods. not typed?
+			store.commit("refreshDesktopNotificationState", null, {root: true});
+
+			if ("Notification" in window && value && Notification.permission !== "granted") {
+				Notification.requestPermission(() =>
+					store.commit("refreshDesktopNotificationState", null, {root: true})
+				).catch((e) => {
+					// eslint-disable-next-line no-console
+					console.error(e);
+				});
+			}
+		},
+	},
+	highlights: {
+		default: "",
+		sync: "always",
+	},
+	highlightExceptions: {
+		default: "",
+		sync: "always",
+	},
+	awayMessage: {
+		default: "",
+		sync: "always",
+	},
+	links: {
+		default: true,
+	},
+	motd: {
+		default: true,
+	},
+	notification: {
+		default: true,
+		sync: "never",
+	},
+	notifyAllMessages: {
+		default: false,
+	},
+	showSeconds: {
+		default: false,
+	},
+	use12hClock: {
+		default: false,
+	},
+	statusMessages: {
+		default: "condensed",
+	},
+	theme: {
+		default: document.getElementById("theme")?.dataset.serverTheme,
+		apply(store: TypedStore, value: string) {
+			const themeEl = document.getElementById("theme");
+			const themeUrl = `themes/${value}.css`;
+
+			if (!(themeEl instanceof HTMLLinkElement)) {
+				throw new Error("theme element is not a link");
+			}
+
+			const hrefAttr = themeEl.attributes.getNamedItem("href");
+
+			if (!hrefAttr) {
+				throw new Error("theme is missing href attribute");
+			}
+
+			if (hrefAttr.value === themeUrl) {
+				return;
+			}
+
+			hrefAttr.value = themeUrl;
+
+			if (!store.state.serverConfiguration) {
+				return;
+			}
+
+			const newTheme = store.state.serverConfiguration?.themes.filter(
+				(theme) => theme.name === value
+			)[0];
+
+			const metaSelector = document.querySelector('meta[name="theme-color"]');
+
+			if (!(metaSelector instanceof HTMLMetaElement)) {
+				throw new Error("theme meta element is not a meta element");
+			}
+
+			if (metaSelector) {
+				const themeColor = newTheme.themeColor || metaSelector.content;
+				metaSelector.content = themeColor;
+			}
+		},
+	},
+	media: {
+		default: true,
+	},
+	uploadCanvas: {
+		default: true,
+	},
+	userStyles: {
+		default: "",
+		apply(store: TypedStore, value: string) {
+			if (!/[?&]nocss/.test(window.location.search)) {
+				const element = document.getElementById("user-specified-css");
+
+				if (element) {
+					element.innerHTML = value;
+				}
+			}
+		},
+	},
+	searchEnabled: {
+		default: false,
+	},
+};
+
+export const config = normalizeConfig(defaultConfig);
+
+export function createState() {
+	const state = {};
+
+	for (const settingName in config) {
+		state[settingName] = config[settingName].default;
+	}
+
+	return state;
+}
+
+function normalizeConfig(obj: any) {
+	const newConfig: Partial<typeof defaultConfig> = {};
+
+	for (const settingName in obj) {
+		newConfig[settingName] = {...defaultSettingConfig, ...obj[settingName]};
+	}
+
+	return newConfig as typeof defaultConfig;
+}
+
+// flatten to type of default
+export type SettingsState = {
+	[key in keyof typeof defaultConfig]: typeof defaultConfig[key]["default"];
+};
diff --git a/client/js/socket-events/auth.js b/client/js/socket-events/auth.ts
similarity index 82%
rename from client/js/socket-events/auth.js
rename to client/js/socket-events/auth.ts
index 58bbb46c..7159734c 100644
--- a/client/js/socket-events/auth.js
+++ b/client/js/socket-events/auth.ts
@@ -1,28 +1,32 @@
-"use strict";
-
 import socket from "../socket";
 import storage from "../localStorage";
 import {router, navigate} from "../router";
-import store from "../store";
+import {store} from "../store";
 import location from "../location";
-let lastServerHash = null;
+let lastServerHash: number | null = null;
+
+declare global {
+	interface Window {
+		g_TheLoungeRemoveLoading?: () => void;
+	}
+}
 
 socket.on("auth:success", function () {
 	store.commit("currentUserVisibleError", "Loading messages…");
 	updateLoadingMessage();
 });
 
-socket.on("auth:failed", function () {
+socket.on("auth:failed", async function () {
 	storage.remove("token");
 
 	if (store.state.appLoaded) {
 		return reloadPage("Authentication failed, reloading…");
 	}
 
-	showSignIn();
+	await showSignIn();
 });
 
-socket.on("auth:start", function (serverHash) {
+socket.on("auth:start", async function (serverHash) {
 	// If we reconnected and serverHash differs, that means the server restarted
 	// And we will reload the page to grab the latest version
 	if (lastServerHash && serverHash !== lastServerHash) {
@@ -70,25 +74,25 @@ socket.on("auth:start", function (serverHash) {
 			hasConfig: store.state.serverConfiguration !== null,
 		});
 	} else {
-		showSignIn();
+		await showSignIn();
 	}
 });
 
-function showSignIn() {
+async function showSignIn() {
 	// TODO: this flashes grey background because it takes a little time for vue to mount signin
 	if (window.g_TheLoungeRemoveLoading) {
 		window.g_TheLoungeRemoveLoading();
 	}
 
-	if (router.currentRoute.name !== "SignIn") {
-		navigate("SignIn");
+	if (router.currentRoute.value.name !== "SignIn") {
+		await navigate("SignIn");
 	}
 }
 
-function reloadPage(message) {
+function reloadPage(message: string) {
 	socket.disconnect();
 	store.commit("currentUserVisibleError", message);
-	location.reload(true);
+	location.reload();
 }
 
 function updateLoadingMessage() {
diff --git a/client/js/socket-events/changelog.js b/client/js/socket-events/changelog.ts
similarity index 91%
rename from client/js/socket-events/changelog.js
rename to client/js/socket-events/changelog.ts
index 30195451..74af9a63 100644
--- a/client/js/socket-events/changelog.js
+++ b/client/js/socket-events/changelog.ts
@@ -1,7 +1,5 @@
-"use strict";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 
 socket.on("changelog", function (data) {
 	store.commit("versionData", data);
@@ -35,5 +33,9 @@ socket.on("changelog", function (data) {
 });
 
 socket.on("changelog:newversion", () => {
+	if (!store.state.serverConfiguration) {
+		return;
+	}
+
 	store.state.serverConfiguration.isUpdateAvailable = true;
 });
diff --git a/client/js/socket-events/commands.js b/client/js/socket-events/commands.ts
similarity index 75%
rename from client/js/socket-events/commands.js
rename to client/js/socket-events/commands.ts
index b060fa1c..dfaba175 100644
--- a/client/js/socket-events/commands.js
+++ b/client/js/socket-events/commands.ts
@@ -1,4 +1,4 @@
-const constants = require("../constants");
+import constants from "../constants";
 import socket from "../socket";
 
 socket.on("commands", function (commands) {
diff --git a/client/js/socket-events/configuration.js b/client/js/socket-events/configuration.ts
similarity index 73%
rename from client/js/socket-events/configuration.js
rename to client/js/socket-events/configuration.ts
index 88417978..1fa7a7a9 100644
--- a/client/js/socket-events/configuration.js
+++ b/client/js/socket-events/configuration.ts
@@ -1,15 +1,13 @@
-"use strict";
-
 import socket from "../socket";
 import upload from "../upload";
-import store from "../store";
+import {store} from "../store";
 
 socket.once("configuration", function (data) {
 	store.commit("serverConfiguration", data);
 
 	// 'theme' setting depends on serverConfiguration.themes so
 	// settings cannot be applied before this point
-	store.dispatch("settings/applyAll");
+	void store.dispatch("settings/applyAll");
 
 	if (data.fileUpload) {
 		upload.initialize();
@@ -20,9 +18,14 @@ socket.once("configuration", function (data) {
 	const currentTheme = data.themes.find((t) => t.name === store.state.settings.theme);
 
 	if (currentTheme === undefined) {
-		store.dispatch("settings/update", {name: "theme", value: data.defaultTheme, sync: true});
+		void store.dispatch("settings/update", {
+			name: "theme",
+			value: data.defaultTheme,
+			sync: true,
+		});
 	} else if (currentTheme.themeColor) {
-		document.querySelector('meta[name="theme-color"]').content = currentTheme.themeColor;
+		(document.querySelector('meta[name="theme-color"]') as HTMLMetaElement).content =
+			currentTheme.themeColor;
 	}
 
 	if (document.body.classList.contains("public")) {
diff --git a/client/js/socket-events/connection.js b/client/js/socket-events/connection.ts
similarity index 90%
rename from client/js/socket-events/connection.js
rename to client/js/socket-events/connection.ts
index 5e924f6c..fafc576e 100644
--- a/client/js/socket-events/connection.js
+++ b/client/js/socket-events/connection.ts
@@ -1,4 +1,4 @@
-import store from "../store";
+import {store} from "../store";
 import socket from "../socket";
 
 socket.on("disconnect", handleDisconnect);
@@ -26,7 +26,7 @@ socket.on("connect", function () {
 });
 
 function handleDisconnect(data) {
-	const message = data.message || data;
+	const message = String(data.message || data);
 
 	store.commit("isConnected", false);
 
@@ -45,6 +45,7 @@ function handleDisconnect(data) {
 	// If the server shuts down, socket.io skips reconnection
 	// and we have to manually call connect to start the process
 	// However, do not reconnect if TL client manually closed the connection
+	// @ts-expect-error Property 'skipReconnect' is private and only accessible within class 'Manager<ListenEvents, EmitEvents>'.ts(2341)
 	if (socket.io.skipReconnect && message !== "io client disconnect") {
 		requestIdleCallback(() => socket.connect(), 2000);
 	}
diff --git a/client/js/socket-events/history_clear.js b/client/js/socket-events/history_clear.js
deleted file mode 100644
index 0f212a93..00000000
--- a/client/js/socket-events/history_clear.js
+++ /dev/null
@@ -1,14 +0,0 @@
-"use strict";
-
-import socket from "../socket";
-import store from "../store";
-
-socket.on("history:clear", function (data) {
-	const {channel} = store.getters.findChannel(data.target);
-
-	channel.messages = [];
-	channel.unread = 0;
-	channel.highlight = 0;
-	channel.firstUnread = 0;
-	channel.moreHistoryAvailable = false;
-});
diff --git a/client/js/socket-events/history_clear.ts b/client/js/socket-events/history_clear.ts
new file mode 100644
index 00000000..328bf124
--- /dev/null
+++ b/client/js/socket-events/history_clear.ts
@@ -0,0 +1,14 @@
+import socket from "../socket";
+import {store} from "../store";
+
+socket.on("history:clear", function (data) {
+	const netChan = store.getters.findChannel(data.target);
+
+	if (netChan?.channel) {
+		netChan.channel.messages = [];
+		netChan.channel.unread = 0;
+		netChan.channel.highlight = 0;
+		netChan.channel.firstUnread = 0;
+		netChan.channel.moreHistoryAvailable = false;
+	}
+});
diff --git a/client/js/socket-events/index.js b/client/js/socket-events/index.ts
similarity index 97%
rename from client/js/socket-events/index.js
rename to client/js/socket-events/index.ts
index 5f4f5624..f3ef8dd2 100644
--- a/client/js/socket-events/index.js
+++ b/client/js/socket-events/index.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import "./connection";
 import "./auth";
 import "./commands";
diff --git a/client/js/socket-events/init.js b/client/js/socket-events/init.ts
similarity index 70%
rename from client/js/socket-events/init.js
rename to client/js/socket-events/init.ts
index fd0451d9..790b38d0 100644
--- a/client/js/socket-events/init.js
+++ b/client/js/socket-events/init.ts
@@ -1,13 +1,12 @@
-"use strict";
-
-import Vue from "vue";
+import {nextTick} from "vue";
 import socket from "../socket";
 import storage from "../localStorage";
 import {router, switchToChannel, navigate} from "../router";
-import store from "../store";
+import {store} from "../store";
 import parseIrcUri from "../helpers/parseIrcUri";
+import {ClientNetwork, InitClientChan} from "../types";
 
-socket.on("init", function (data) {
+socket.on("init", async function (data) {
 	store.commit("networks", mergeNetworkData(data.networks));
 	store.commit("isConnected", true);
 	store.commit("currentUserVisibleError", null);
@@ -21,36 +20,47 @@ socket.on("init", function (data) {
 
 		socket.emit("setting:get");
 
+		try {
+			await router.isReady();
+		} catch (e: any) {
+			// if the router throws an error, it means the route isn't matched,
+			// so we can continue on.
+		}
+
 		if (window.g_TheLoungeRemoveLoading) {
 			window.g_TheLoungeRemoveLoading();
 		}
 
-		Vue.nextTick(() => {
-			// If we handled query parameters like irc:// links or just general
-			// connect parameters in public mode, then nothing to do here
-			if (!handleQueryParams()) {
-				// If we are on an unknown route or still on SignIn component
-				// then we can open last known channel on server, or Connect window if none
-				if (!router.currentRoute.name || router.currentRoute.name === "SignIn") {
-					const channel = store.getters.findChannel(data.active);
+		const handledQuery = await handleQueryParams();
 
-					if (channel) {
-						switchToChannel(channel.channel);
-					} else if (store.state.networks.length > 0) {
-						// Server is telling us to open a channel that does not exist
-						// For example, it can be unset if you first open the page after server start
-						switchToChannel(store.state.networks[0].channels[0]);
-					} else {
-						navigate("Connect");
-					}
+		// If we handled query parameters like irc:// links or just general
+		// connect parameters in public mode, then nothing to do here
+		if (!handledQuery) {
+			// If we are on an unknown route or still on SignIn component
+			// then we can open last known channel on server, or Connect window if none
+			if (
+				!router.currentRoute?.value?.name ||
+				router.currentRoute?.value?.name === "SignIn"
+			) {
+				const channel = store.getters.findChannel(data.active);
+
+				if (channel) {
+					switchToChannel(channel.channel);
+				} else if (store.state.networks.length > 0) {
+					// Server is telling us to open a channel that does not exist
+					// For example, it can be unset if you first open the page after server start
+					switchToChannel(store.state.networks[0].channels[0]);
+				} else {
+					await navigate("Connect");
 				}
 			}
-		});
+		}
 	}
 });
 
-function mergeNetworkData(newNetworks) {
-	const collapsedNetworks = new Set(JSON.parse(storage.get("thelounge.networks.collapsed")));
+function mergeNetworkData(newNetworks: ClientNetwork[]) {
+	const stored = storage.get("thelounge.networks.collapsed");
+	const collapsedNetworks = stored ? new Set(JSON.parse(stored)) : new Set();
 
 	for (let n = 0; n < newNetworks.length; n++) {
 		const network = newNetworks[n];
@@ -76,7 +86,7 @@ function mergeNetworkData(newNetworks) {
 			if (key === "channels") {
 				currentNetwork.channels = mergeChannelData(
 					currentNetwork.channels,
-					network.channels
+					network.channels as InitClientChan[]
 				);
 			} else {
 				currentNetwork[key] = network[key];
@@ -89,7 +99,7 @@ function mergeNetworkData(newNetworks) {
 	return newNetworks;
 }
 
-function mergeChannelData(oldChannels, newChannels) {
+function mergeChannelData(oldChannels: InitClientChan[], newChannels: InitClientChan[]) {
 	for (let c = 0; c < newChannels.length; c++) {
 		const channel = newChannels[c];
 		const currentChannel = oldChannels.find((chan) => chan.id === channel.id);
@@ -133,7 +143,7 @@ function mergeChannelData(oldChannels, newChannels) {
 			// on the client, and decide whether theres more messages to load from server
 			if (key === "totalMessages") {
 				currentChannel.moreHistoryAvailable =
-					channel.totalMessages > currentChannel.messages.length;
+					channel.totalMessages! > currentChannel.messages.length;
 
 				continue;
 			}
@@ -153,7 +163,7 @@ function mergeChannelData(oldChannels, newChannels) {
 	return newChannels;
 }
 
-function handleQueryParams() {
+async function handleQueryParams() {
 	if (!("URLSearchParams" in window)) {
 		return false;
 	}
@@ -169,10 +179,10 @@ function handleQueryParams() {
 	if (params.has("uri")) {
 		// Set default connection settings from IRC protocol links
 		const uri = params.get("uri");
-		const queryParams = parseIrcUri(uri);
+		const queryParams = parseIrcUri(String(uri));
 
 		cleanParams();
-		router.push({name: "Connect", query: queryParams});
+		await router.push({name: "Connect", query: queryParams});
 
 		return true;
 	} else if (document.body.classList.contains("public") && document.location.search) {
@@ -180,7 +190,7 @@ function handleQueryParams() {
 		const queryParams = Object.fromEntries(params.entries());
 
 		cleanParams();
-		router.push({name: "Connect", query: queryParams});
+		await router.push({name: "Connect", query: queryParams});
 
 		return true;
 	}
diff --git a/client/js/socket-events/join.js b/client/js/socket-events/join.ts
similarity index 64%
rename from client/js/socket-events/join.js
rename to client/js/socket-events/join.ts
index f7159dcb..9f4539c0 100644
--- a/client/js/socket-events/join.js
+++ b/client/js/socket-events/join.ts
@@ -1,7 +1,5 @@
-"use strict";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 import {switchToChannel} from "../router";
 
 socket.on("join", function (data) {
@@ -20,5 +18,12 @@ socket.on("join", function (data) {
 		return;
 	}
 
-	switchToChannel(store.getters.findChannel(data.chan.id).channel);
+	const chan = store.getters.findChannel(data.chan.id);
+
+	if (chan) {
+		switchToChannel(chan.channel);
+	} else {
+		// eslint-disable-next-line no-console
+		console.error("Could not find channel", data.chan.id);
+	}
 });
diff --git a/client/js/socket-events/mentions.js b/client/js/socket-events/mentions.js
deleted file mode 100644
index b70ade0b..00000000
--- a/client/js/socket-events/mentions.js
+++ /dev/null
@@ -1,8 +0,0 @@
-"use strict";
-
-import socket from "../socket";
-import store from "../store";
-
-socket.on("mentions:list", function (data) {
-	store.commit("mentions", data);
-});
diff --git a/client/js/socket-events/mentions.ts b/client/js/socket-events/mentions.ts
new file mode 100644
index 00000000..8f71e1e2
--- /dev/null
+++ b/client/js/socket-events/mentions.ts
@@ -0,0 +1,7 @@
+import socket from "../socket";
+import {store} from "../store";
+import {ClientMention} from "../types";
+
+socket.on("mentions:list", function (data) {
+	store.commit("mentions", data as ClientMention[]);
+});
diff --git a/client/js/socket-events/more.js b/client/js/socket-events/more.ts
similarity index 57%
rename from client/js/socket-events/more.js
rename to client/js/socket-events/more.ts
index 34abf2c5..bd7dad3e 100644
--- a/client/js/socket-events/more.js
+++ b/client/js/socket-events/more.ts
@@ -1,11 +1,10 @@
-"use strict";
-
-import Vue from "vue";
+import {nextTick} from "vue";
 
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
+import {ClientMessage} from "../types";
 
-socket.on("more", function (data) {
+socket.on("more", async (data) => {
 	const channel = store.getters.findChannel(data.chan)?.channel;
 
 	if (!channel) {
@@ -17,13 +16,12 @@ socket.on("more", function (data) {
 			.filter((m) => m.self && m.text && m.type === "message")
 			.map((m) => m.text)
 			.reverse()
-			.slice(null, 100 - channel.inputHistory.length)
+			.slice(0, 100 - channel.inputHistory.length)
 	);
 	channel.moreHistoryAvailable =
 		data.totalMessages > channel.messages.length + data.messages.length;
-	channel.messages.unshift(...data.messages);
+	channel.messages.unshift(...(data.messages as ClientMessage[]));
 
-	Vue.nextTick(() => {
-		channel.historyLoading = false;
-	});
+	await nextTick();
+	channel.historyLoading = false;
 });
diff --git a/client/js/socket-events/msg.js b/client/js/socket-events/msg.ts
similarity index 84%
rename from client/js/socket-events/msg.js
rename to client/js/socket-events/msg.ts
index cbcfd650..523b2f56 100644
--- a/client/js/socket-events/msg.js
+++ b/client/js/socket-events/msg.ts
@@ -1,9 +1,9 @@
-"use strict";
-
+/* eslint-disable @typescript-eslint/restrict-plus-operands */
 import socket from "../socket";
 import cleanIrcMessage from "../helpers/ircmessageparser/cleanIrcMessage";
-import store from "../store";
+import {store} from "../store";
 import {switchToChannel} from "../router";
+import {ClientChan, ClientMention, ClientMessage, NetChan} from "../types";
 
 let pop;
 
@@ -12,6 +12,7 @@ try {
 	pop.src = "audio/pop.wav";
 } catch (e) {
 	pop = {
+		// eslint-disable-next-line @typescript-eslint/no-empty-function
 		play() {},
 	};
 }
@@ -94,7 +95,12 @@ socket.on("msg", function (data) {
 	}
 });
 
-function notifyMessage(targetId, channel, activeChannel, msg) {
+function notifyMessage(
+	targetId: number,
+	channel: ClientChan,
+	activeChannel: NetChan | undefined,
+	msg: ClientMessage
+) {
 	if (channel.muted) {
 		return;
 	}
@@ -114,14 +120,14 @@ function notifyMessage(targetId, channel, activeChannel, msg) {
 				"Notification" in window &&
 				Notification.permission === "granted"
 			) {
-				let title;
-				let body;
+				let title: string;
+				let body: string;
 
 				if (msg.type === "invite") {
 					title = "New channel invite:";
 					body = msg.from.nick + " invited you to " + msg.channel;
 				} else {
-					title = msg.from.nick;
+					title = String(msg.from.nick);
 
 					if (channel.type !== "query") {
 						title += ` (${channel.name})`;
@@ -134,19 +140,23 @@ function notifyMessage(targetId, channel, activeChannel, msg) {
 					body = cleanIrcMessage(msg.text);
 				}
 
-				const timestamp = Date.parse(msg.time);
+				const timestamp = Date.parse(String(msg.time));
 
 				try {
 					if (store.state.hasServiceWorker) {
-						navigator.serviceWorker.ready.then((registration) => {
-							registration.active.postMessage({
-								type: "notification",
-								chanId: targetId,
-								timestamp: timestamp,
-								title: title,
-								body: body,
+						navigator.serviceWorker.ready
+							.then((registration) => {
+								registration.active?.postMessage({
+									type: "notification",
+									chanId: targetId,
+									timestamp: timestamp,
+									title: title,
+									body: body,
+								});
+							})
+							.catch(() => {
+								// no-op
 							});
-						});
 					} else {
 						const notify = new Notification(title, {
 							tag: `chan-${targetId}`,
@@ -162,7 +172,7 @@ function notifyMessage(targetId, channel, activeChannel, msg) {
 							const channelTarget = store.getters.findChannel(targetId);
 
 							if (channelTarget) {
-								switchToChannel(channelTarget);
+								switchToChannel(channelTarget.channel);
 							}
 						});
 					}
diff --git a/client/js/socket-events/msg_preview.js b/client/js/socket-events/msg_preview.js
deleted file mode 100644
index 310dcd51..00000000
--- a/client/js/socket-events/msg_preview.js
+++ /dev/null
@@ -1,21 +0,0 @@
-"use strict";
-
-import Vue from "vue";
-
-import socket from "../socket";
-import store from "../store";
-
-socket.on("msg:preview", function (data) {
-	const {channel} = store.getters.findChannel(data.chan);
-	const message = channel.messages.find((m) => m.id === data.id);
-
-	if (!message) {
-		return;
-	}
-
-	const previewIndex = message.previews.findIndex((m) => m.link === data.preview.link);
-
-	if (previewIndex > -1) {
-		Vue.set(message.previews, previewIndex, data.preview);
-	}
-});
diff --git a/client/js/socket-events/msg_preview.ts b/client/js/socket-events/msg_preview.ts
new file mode 100644
index 00000000..96cb82e3
--- /dev/null
+++ b/client/js/socket-events/msg_preview.ts
@@ -0,0 +1,17 @@
+import socket from "../socket";
+import {store} from "../store";
+
+socket.on("msg:preview", function (data) {
+	const netChan = store.getters.findChannel(data.chan);
+	const message = netChan?.channel.messages.find((m) => m.id === data.id);
+
+	if (!message) {
+		return;
+	}
+
+	const previewIndex = message.previews.findIndex((m) => m.link === data.preview.link);
+
+	if (previewIndex > -1) {
+		message.previews[previewIndex] = data.preview;
+	}
+});
diff --git a/client/js/socket-events/msg_special.js b/client/js/socket-events/msg_special.js
deleted file mode 100644
index b0d15692..00000000
--- a/client/js/socket-events/msg_special.js
+++ /dev/null
@@ -1,11 +0,0 @@
-"use strict";
-
-import socket from "../socket";
-import store from "../store";
-import {switchToChannel} from "../router";
-
-socket.on("msg:special", function (data) {
-	const channel = store.getters.findChannel(data.chan);
-	channel.channel.data = data.data;
-	switchToChannel(channel.channel);
-});
diff --git a/client/js/socket-events/msg_special.ts b/client/js/socket-events/msg_special.ts
new file mode 100644
index 00000000..d93054e8
--- /dev/null
+++ b/client/js/socket-events/msg_special.ts
@@ -0,0 +1,14 @@
+import socket from "../socket";
+import {store} from "../store";
+import {switchToChannel} from "../router";
+
+socket.on("msg:special", function (data) {
+	const netChan = store.getters.findChannel(data.chan);
+
+	if (!netChan) {
+		return;
+	}
+
+	netChan.channel.data = data.data;
+	switchToChannel(netChan.channel);
+});
diff --git a/client/js/socket-events/mute_changed.js b/client/js/socket-events/mute_changed.js
deleted file mode 100644
index 4debbd1d..00000000
--- a/client/js/socket-events/mute_changed.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import socket from "../socket";
-import store from "../store";
-
-socket.on("mute:changed", (response) => {
-	const {target, status} = response;
-	const {channel, network} = store.getters.findChannel(target);
-
-	if (channel.type === "lobby") {
-		for (const chan of network.channels) {
-			if (chan.type !== "special") {
-				chan.muted = status;
-			}
-		}
-	} else {
-		channel.muted = status;
-	}
-});
diff --git a/client/js/socket-events/mute_changed.ts b/client/js/socket-events/mute_changed.ts
new file mode 100644
index 00000000..bf754c34
--- /dev/null
+++ b/client/js/socket-events/mute_changed.ts
@@ -0,0 +1,18 @@
+import socket from "../socket";
+import {store} from "../store";
+
+socket.on("mute:changed", (response) => {
+	const {target, status} = response;
+
+	const netChan = store.getters.findChannel(target);
+
+	if (netChan?.channel.type === "lobby") {
+		for (const chan of netChan.network.channels) {
+			if (chan.type !== "special") {
+				chan.muted = status;
+			}
+		}
+	} else if (netChan) {
+		netChan.channel.muted = status;
+	}
+});
diff --git a/client/js/socket-events/names.js b/client/js/socket-events/names.js
deleted file mode 100644
index bfd1c6c4..00000000
--- a/client/js/socket-events/names.js
+++ /dev/null
@@ -1,12 +0,0 @@
-"use strict";
-
-import socket from "../socket";
-import store from "../store";
-
-socket.on("names", function (data) {
-	const channel = store.getters.findChannel(data.id);
-
-	if (channel) {
-		channel.channel.users = data.users;
-	}
-});
diff --git a/client/js/socket-events/names.ts b/client/js/socket-events/names.ts
new file mode 100644
index 00000000..b200385b
--- /dev/null
+++ b/client/js/socket-events/names.ts
@@ -0,0 +1,10 @@
+import socket from "../socket";
+import {store} from "../store";
+
+socket.on("names", function (data) {
+	const netChan = store.getters.findChannel(data.id);
+
+	if (netChan) {
+		netChan.channel.users = data.users;
+	}
+});
diff --git a/client/js/socket-events/network.js b/client/js/socket-events/network.ts
similarity index 86%
rename from client/js/socket-events/network.js
rename to client/js/socket-events/network.ts
index 9f248657..e5dae7b4 100644
--- a/client/js/socket-events/network.js
+++ b/client/js/socket-events/network.ts
@@ -1,9 +1,5 @@
-"use strict";
-
-import Vue from "vue";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 import {switchToChannel} from "../router";
 
 socket.on("network", function (data) {
@@ -23,7 +19,7 @@ socket.on("network:options", function (data) {
 	const network = store.getters.findNetwork(data.network);
 
 	if (network) {
-		network.serverOptions = data.serverOptions;
+		network.serverOptions = data.serverOptions as typeof network.serverOptions;
 	}
 });
 
@@ -61,11 +57,14 @@ socket.on("network:info", function (data) {
 	}
 
 	for (const key in data) {
-		Vue.set(network, key, data[key]);
+		network[key] = data[key];
 	}
 });
 
 socket.on("network:name", function (data) {
 	const network = store.getters.findNetwork(data.uuid);
-	network.name = network.channels[0].name = data.name;
+
+	if (network) {
+		network.name = network.channels[0].name = data.name;
+	}
 });
diff --git a/client/js/socket-events/nick.js b/client/js/socket-events/nick.ts
similarity index 79%
rename from client/js/socket-events/nick.js
rename to client/js/socket-events/nick.ts
index 08211451..05e997b0 100644
--- a/client/js/socket-events/nick.js
+++ b/client/js/socket-events/nick.ts
@@ -1,7 +1,5 @@
-"use strict";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 
 socket.on("nick", function (data) {
 	const network = store.getters.findNetwork(data.network);
diff --git a/client/js/socket-events/open.js b/client/js/socket-events/open.ts
similarity index 93%
rename from client/js/socket-events/open.js
rename to client/js/socket-events/open.ts
index 18bcf24c..26298bac 100644
--- a/client/js/socket-events/open.js
+++ b/client/js/socket-events/open.ts
@@ -1,7 +1,5 @@
-"use strict";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 
 // Sync unread badge and marker when other clients open a channel
 socket.on("open", function (id) {
diff --git a/client/js/socket-events/part.js b/client/js/socket-events/part.ts
similarity index 80%
rename from client/js/socket-events/part.js
rename to client/js/socket-events/part.ts
index 7706f41c..548818c4 100644
--- a/client/js/socket-events/part.js
+++ b/client/js/socket-events/part.ts
@@ -1,10 +1,8 @@
-"use strict";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 import {switchToChannel} from "../router";
 
-socket.on("part", function (data) {
+socket.on("part", async function (data) {
 	// When parting from the active channel/query, jump to the network's lobby
 	if (store.state.activeChannel && store.state.activeChannel.channel.id === data.chan) {
 		switchToChannel(store.state.activeChannel.network.channels[0]);
@@ -21,5 +19,5 @@ socket.on("part", function (data) {
 		1
 	);
 
-	store.dispatch("partChannel", channel);
+	await store.dispatch("partChannel", channel);
 });
diff --git a/client/js/socket-events/quit.js b/client/js/socket-events/quit.ts
similarity index 83%
rename from client/js/socket-events/quit.js
rename to client/js/socket-events/quit.ts
index ed3da8d4..21460fb3 100644
--- a/client/js/socket-events/quit.js
+++ b/client/js/socket-events/quit.ts
@@ -1,10 +1,8 @@
-"use strict";
-
 import socket from "../socket";
 import {switchToChannel, navigate} from "../router";
-import store from "../store";
+import {store} from "../store";
 
-socket.on("quit", function (data) {
+socket.on("quit", async function (data) {
 	// If we're in a channel, and it's on the network that is being removed,
 	// then open another channel window
 	const isCurrentNetworkBeingRemoved =
@@ -19,6 +17,6 @@ socket.on("quit", function (data) {
 	if (store.state.networks.length > 0) {
 		switchToChannel(store.state.networks[0].channels[0]);
 	} else {
-		navigate("Connect");
+		await navigate("Connect");
 	}
 });
diff --git a/client/js/socket-events/search.js b/client/js/socket-events/search.ts
similarity index 90%
rename from client/js/socket-events/search.js
rename to client/js/socket-events/search.ts
index 36cd1e4e..7553e990 100644
--- a/client/js/socket-events/search.js
+++ b/client/js/socket-events/search.ts
@@ -1,5 +1,5 @@
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 
 socket.on("search:results", (response) => {
 	store.commit("messageSearchInProgress", false);
diff --git a/client/js/socket-events/sessions_list.js b/client/js/socket-events/sessions_list.ts
similarity index 78%
rename from client/js/socket-events/sessions_list.js
rename to client/js/socket-events/sessions_list.ts
index 98cf777f..14af6ca7 100644
--- a/client/js/socket-events/sessions_list.js
+++ b/client/js/socket-events/sessions_list.ts
@@ -1,7 +1,5 @@
-"use strict";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 
 socket.on("sessions:list", function (data) {
 	data.sort((a, b) => b.lastUse - a.lastUse);
diff --git a/client/js/socket-events/setting.js b/client/js/socket-events/setting.js
deleted file mode 100644
index 62ae6735..00000000
--- a/client/js/socket-events/setting.js
+++ /dev/null
@@ -1,24 +0,0 @@
-"use strict";
-
-import socket from "../socket";
-import store from "../store";
-
-socket.on("setting:new", function (data) {
-	const name = data.name;
-	const value = data.value;
-	store.dispatch("settings/update", {name, value, sync: false});
-});
-
-socket.on("setting:all", function (settings) {
-	const serverHasSettings = Object.keys(settings).length > 0;
-
-	store.commit("serverHasSettings", serverHasSettings);
-
-	if (serverHasSettings) {
-		for (const name in settings) {
-			store.dispatch("settings/update", {name, value: settings[name], sync: false});
-		}
-	} else {
-		store.dispatch("settings/syncAll");
-	}
-});
diff --git a/client/js/socket-events/setting.ts b/client/js/socket-events/setting.ts
new file mode 100644
index 00000000..7f217d5a
--- /dev/null
+++ b/client/js/socket-events/setting.ts
@@ -0,0 +1,22 @@
+import socket from "../socket";
+import {store} from "../store";
+
+socket.on("setting:new", async function (data) {
+	const name = data.name;
+	const value = data.value;
+	await store.dispatch("settings/update", {name, value, sync: false});
+});
+
+socket.on("setting:all", async function (settings) {
+	const serverHasSettings = Object.keys(settings).length > 0;
+
+	store.commit("serverHasSettings", serverHasSettings);
+
+	if (serverHasSettings) {
+		for (const name in settings) {
+			await store.dispatch("settings/update", {name, value: settings[name], sync: false});
+		}
+	} else {
+		await store.dispatch("settings/syncAll");
+	}
+});
diff --git a/client/js/socket-events/sign_out.js b/client/js/socket-events/sign_out.ts
similarity index 88%
rename from client/js/socket-events/sign_out.js
rename to client/js/socket-events/sign_out.ts
index be37cef4..0588e4f8 100644
--- a/client/js/socket-events/sign_out.js
+++ b/client/js/socket-events/sign_out.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import Auth from "../auth";
 
diff --git a/client/js/socket-events/sync_sort.js b/client/js/socket-events/sync_sort.ts
similarity index 51%
rename from client/js/socket-events/sync_sort.js
rename to client/js/socket-events/sync_sort.ts
index abb0a256..d39a5dba 100644
--- a/client/js/socket-events/sync_sort.js
+++ b/client/js/socket-events/sync_sort.ts
@@ -1,14 +1,15 @@
-"use strict";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 
 socket.on("sync_sort", function (data) {
 	const order = data.order;
 
 	switch (data.type) {
 		case "networks":
-			store.commit("sortNetworks", (a, b) => order.indexOf(a.uuid) - order.indexOf(b.uuid));
+			store.commit(
+				"sortNetworks",
+				(a, b) => (order as string[]).indexOf(a.uuid) - (order as string[]).indexOf(b.uuid)
+			);
 
 			break;
 
@@ -19,7 +20,9 @@ socket.on("sync_sort", function (data) {
 				return;
 			}
 
-			network.channels.sort((a, b) => order.indexOf(a.id) - order.indexOf(b.id));
+			network.channels.sort(
+				(a, b) => (order as number[]).indexOf(a.id) - (order as number[]).indexOf(b.id)
+			);
 
 			break;
 		}
diff --git a/client/js/socket-events/topic.js b/client/js/socket-events/topic.ts
similarity index 80%
rename from client/js/socket-events/topic.js
rename to client/js/socket-events/topic.ts
index f14dcee5..6f75dad5 100644
--- a/client/js/socket-events/topic.js
+++ b/client/js/socket-events/topic.ts
@@ -1,7 +1,5 @@
-"use strict";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 
 socket.on("topic", function (data) {
 	const channel = store.getters.findChannel(data.chan);
diff --git a/client/js/socket-events/users.js b/client/js/socket-events/users.ts
similarity index 88%
rename from client/js/socket-events/users.js
rename to client/js/socket-events/users.ts
index 3d040f1f..1021c625 100644
--- a/client/js/socket-events/users.js
+++ b/client/js/socket-events/users.ts
@@ -1,7 +1,5 @@
-"use strict";
-
 import socket from "../socket";
-import store from "../store";
+import {store} from "../store";
 
 socket.on("users", function (data) {
 	if (store.state.activeChannel && store.state.activeChannel.channel.id === data.chan) {
diff --git a/client/js/socket.js b/client/js/socket.js
deleted file mode 100644
index 509ba31f..00000000
--- a/client/js/socket.js
+++ /dev/null
@@ -1,17 +0,0 @@
-"use strict";
-
-import io from "socket.io-client";
-
-const socket = io({
-	transports: JSON.parse(document.body.dataset.transports),
-	path: window.location.pathname + "socket.io/",
-	autoConnect: false,
-	reconnection: !document.body.classList.contains("public"),
-});
-
-// Ease debugging socket during development
-if (process.env.NODE_ENV === "development") {
-	window.socket = socket;
-}
-
-export default socket;
diff --git a/client/js/socket.ts b/client/js/socket.ts
new file mode 100644
index 00000000..f01b628d
--- /dev/null
+++ b/client/js/socket.ts
@@ -0,0 +1,22 @@
+import io, {Socket} from "socket.io-client";
+import type {ServerToClientEvents, ClientToServerEvents} from "../../server/types/socket-events";
+
+const socket: Socket<ServerToClientEvents, ClientToServerEvents> = io({
+	transports: JSON.parse(document.body.dataset.transports || "['polling', 'websocket']"),
+	path: window.location.pathname + "socket.io/",
+	autoConnect: false,
+	reconnection: !document.body.classList.contains("public"),
+});
+
+// Ease debugging socket during development
+if (process.env.NODE_ENV === "development") {
+	window.socket = socket;
+}
+
+declare global {
+	interface Window {
+		socket: Socket;
+	}
+}
+
+export default socket;
diff --git a/client/js/store-settings.js b/client/js/store-settings.ts
similarity index 88%
rename from client/js/store-settings.js
rename to client/js/store-settings.ts
index bed36968..bc914be9 100644
--- a/client/js/store-settings.js
+++ b/client/js/store-settings.ts
@@ -1,8 +1,10 @@
 import storage from "./localStorage";
 import socket from "./socket";
 import {config, createState} from "./settings";
+import {Store} from "vuex";
+import {State} from "./store";
 
-export function createSettingsStore(store) {
+export function createSettingsStore(store: Store<State>) {
 	return {
 		namespaced: true,
 		state: assignStoredSettings(createState(), loadFromLocalStorage()),
@@ -69,10 +71,10 @@ export function createSettingsStore(store) {
 }
 
 function loadFromLocalStorage() {
-	let storedSettings;
+	let storedSettings: Record<string, any> = {};
 
 	try {
-		storedSettings = JSON.parse(storage.get("settings"));
+		storedSettings = JSON.parse(storage.get("settings") || "{}");
 	} catch (e) {
 		storage.remove("settings");
 	}
@@ -96,7 +98,10 @@ function loadFromLocalStorage() {
  * @param {object} defaultSettings
  * @param {object} storedSettings
  */
-function assignStoredSettings(defaultSettings, storedSettings) {
+function assignStoredSettings(
+	defaultSettings: Record<string, any>,
+	storedSettings: Record<string, any>
+) {
 	const newSettings = {...defaultSettings};
 
 	for (const key in defaultSettings) {
diff --git a/client/js/store.js b/client/js/store.js
deleted file mode 100644
index d15db357..00000000
--- a/client/js/store.js
+++ /dev/null
@@ -1,233 +0,0 @@
-import Vue from "vue";
-import Vuex from "vuex";
-import {createSettingsStore} from "./store-settings";
-import storage from "./localStorage";
-
-const appName = document.title;
-
-Vue.use(Vuex);
-
-function detectDesktopNotificationState() {
-	if (!("Notification" in window)) {
-		return "unsupported";
-	} else if (Notification.permission === "granted") {
-		return "granted";
-	} else if (!window.isSecureContext) {
-		return "nohttps";
-	}
-
-	return "blocked";
-}
-
-const store = new Vuex.Store({
-	state: {
-		appLoaded: false,
-		activeChannel: null,
-		currentUserVisibleError: null,
-		desktopNotificationState: detectDesktopNotificationState(),
-		isAutoCompleting: false,
-		isConnected: false,
-		networks: [],
-		mentions: [],
-		hasServiceWorker: false,
-		pushNotificationState: "unsupported",
-		serverConfiguration: null,
-		sessions: [],
-		sidebarOpen: false,
-		sidebarDragging: false,
-		userlistOpen: storage.get("thelounge.state.userlist") !== "false",
-		versionData: null,
-		versionStatus: "loading",
-		versionDataExpired: false,
-		serverHasSettings: false,
-		messageSearchResults: null,
-		messageSearchInProgress: false,
-		searchEnabled: false,
-	},
-	mutations: {
-		appLoaded(state) {
-			state.appLoaded = true;
-		},
-		activeChannel(state, channel) {
-			state.activeChannel = channel;
-		},
-		currentUserVisibleError(state, error) {
-			state.currentUserVisibleError = error;
-		},
-		refreshDesktopNotificationState(state) {
-			state.desktopNotificationState = detectDesktopNotificationState();
-		},
-		isAutoCompleting(state, isAutoCompleting) {
-			state.isAutoCompleting = isAutoCompleting;
-		},
-		isConnected(state, payload) {
-			state.isConnected = payload;
-		},
-		networks(state, networks) {
-			state.networks = networks;
-		},
-		mentions(state, mentions) {
-			state.mentions = mentions;
-		},
-		removeNetwork(state, networkId) {
-			state.networks.splice(
-				store.state.networks.findIndex((n) => n.uuid === networkId),
-				1
-			);
-		},
-		sortNetworks(state, sortFn) {
-			state.networks.sort(sortFn);
-		},
-		hasServiceWorker(state) {
-			state.hasServiceWorker = true;
-		},
-		pushNotificationState(state, pushNotificationState) {
-			state.pushNotificationState = pushNotificationState;
-		},
-		serverConfiguration(state, serverConfiguration) {
-			state.serverConfiguration = serverConfiguration;
-		},
-		sessions(state, payload) {
-			state.sessions = payload;
-		},
-		sidebarOpen(state, payload) {
-			state.sidebarOpen = payload;
-		},
-		sidebarDragging(state, payload) {
-			state.sidebarDragging = payload;
-		},
-		toggleSidebar(state) {
-			state.sidebarOpen = !state.sidebarOpen;
-		},
-		toggleUserlist(state) {
-			state.userlistOpen = !state.userlistOpen;
-		},
-		userlistOpen(state, payload) {
-			state.userlistOpen = payload;
-		},
-		versionData(state, payload) {
-			state.versionData = payload;
-		},
-		versionStatus(state, payload) {
-			state.versionStatus = payload;
-		},
-		versionDataExpired(state, payload) {
-			state.versionDataExpired = payload;
-		},
-		serverHasSettings(state, value) {
-			state.serverHasSettings = value;
-		},
-		messageSearchInProgress(state, value) {
-			state.messageSearchInProgress = value;
-		},
-		messageSearchResults(state, value) {
-			state.messageSearchResults = value;
-		},
-		addMessageSearchResults(state, value) {
-			// Append the search results and add networks and channels to new messages
-			value.results = [...state.messageSearchResults.results, ...value.results];
-
-			state.messageSearchResults = value;
-		},
-	},
-	actions: {
-		partChannel({commit, state}, netChan) {
-			const mentions = state.mentions.filter((msg) => !(msg.chanId === netChan.channel.id));
-			commit("mentions", mentions);
-		},
-	},
-	getters: {
-		findChannelOnCurrentNetwork: (state) => (name) => {
-			name = name.toLowerCase();
-			return state.activeChannel.network.channels.find((c) => c.name.toLowerCase() === name);
-		},
-		findChannelOnNetwork: (state) => (networkUuid, channelName) => {
-			for (const network of state.networks) {
-				if (network.uuid !== networkUuid) {
-					continue;
-				}
-
-				for (const channel of network.channels) {
-					if (channel.name === channelName) {
-						return {network, channel};
-					}
-				}
-			}
-
-			return null;
-		},
-		findChannel: (state) => (id) => {
-			for (const network of state.networks) {
-				for (const channel of network.channels) {
-					if (channel.id === id) {
-						return {network, channel};
-					}
-				}
-			}
-
-			return null;
-		},
-		findNetwork: (state) => (uuid) => {
-			for (const network of state.networks) {
-				if (network.uuid === uuid) {
-					return network;
-				}
-			}
-
-			return null;
-		},
-		highlightCount(state) {
-			let highlightCount = 0;
-
-			for (const network of state.networks) {
-				for (const channel of network.channels) {
-					if (channel.muted) {
-						continue;
-					}
-
-					highlightCount += channel.highlight;
-				}
-			}
-
-			return highlightCount;
-		},
-		title(state, getters) {
-			const alertEventCount = getters.highlightCount ? `(${getters.highlightCount}) ` : "";
-
-			const channelname = state.activeChannel ? `${state.activeChannel.channel.name} — ` : "";
-
-			return alertEventCount + channelname + appName;
-		},
-		initChannel: () => (channel) => {
-			// TODO: This should be a mutation
-			channel.pendingMessage = "";
-			channel.inputHistoryPosition = 0;
-
-			channel.inputHistory = [""].concat(
-				channel.messages
-					.filter((m) => m.self && m.text && m.type === "message")
-					.map((m) => m.text)
-					.reverse()
-					.slice(null, 99)
-			);
-			channel.historyLoading = false;
-			channel.scrolledToBottom = true;
-			channel.editTopic = false;
-
-			channel.moreHistoryAvailable = channel.totalMessages > channel.messages.length;
-			delete channel.totalMessages;
-
-			if (channel.type === "channel") {
-				channel.usersOutdated = true;
-			}
-
-			return channel;
-		},
-	},
-});
-
-// Settings module is registered dynamically because it benefits
-// from a direct reference to the store
-store.registerModule("settings", createSettingsStore(store));
-
-export default store;
diff --git a/client/js/store.ts b/client/js/store.ts
new file mode 100644
index 00000000..d105a5d9
--- /dev/null
+++ b/client/js/store.ts
@@ -0,0 +1,414 @@
+/* eslint-disable @typescript-eslint/no-shadow */
+
+import {ActionContext, createStore, Store, useStore as baseUseStore} from "vuex";
+import {createSettingsStore} from "./store-settings";
+import storage from "./localStorage";
+import type {
+	ClientChan,
+	ClientConfiguration,
+	ClientNetwork,
+	InitClientChan,
+	NetChan,
+	ClientMessage,
+	ClientMention,
+} from "./types";
+import type {InjectionKey} from "vue";
+
+import {SettingsState} from "./settings";
+
+const appName = document.title;
+
+enum DesktopNotificationState {
+	Unsupported = "unsupported",
+	Blocked = "blocked",
+	NoHttps = "nohttps",
+	Granted = "granted",
+}
+
+function detectDesktopNotificationState(): DesktopNotificationState {
+	if (!("Notification" in window)) {
+		return DesktopNotificationState.Unsupported;
+	} else if (Notification.permission === DesktopNotificationState.Granted) {
+		return DesktopNotificationState.Granted;
+	} else if (!window.isSecureContext) {
+		return DesktopNotificationState.NoHttps;
+	}
+
+	return DesktopNotificationState.Blocked;
+}
+
+export type ClientSession = {
+	current: boolean;
+	active: number;
+	lastUse: number;
+	ip: string;
+	agent: string;
+	token: string;
+};
+
+export type State = {
+	appLoaded: boolean;
+	activeChannel?: NetChan;
+	currentUserVisibleError: string | null;
+	desktopNotificationState: DesktopNotificationState;
+	isAutoCompleting: boolean;
+	isConnected: boolean;
+	networks: ClientNetwork[];
+	// TODO: type
+	mentions: ClientMention[];
+	hasServiceWorker: boolean;
+	pushNotificationState: string;
+	serverConfiguration: ClientConfiguration | null;
+	sessions: ClientSession[];
+	sidebarOpen: boolean;
+	sidebarDragging: boolean;
+	userlistOpen: boolean;
+	versionData:
+		| null
+		| undefined
+		| {
+				latest: {
+					version: string;
+					prerelease: boolean;
+					url: string;
+				};
+				current: {
+					version: string;
+					prerelease: boolean;
+					url: string;
+					changelog: string;
+				};
+		  };
+	versionStatus: "loading" | "new-version" | "new-packages" | "up-to-date" | "error";
+	versionDataExpired: boolean;
+	serverHasSettings: boolean;
+	messageSearchResults: {
+		results: ClientMessage[];
+	} | null;
+	messageSearchInProgress: boolean;
+	searchEnabled: boolean;
+};
+
+const state = () =>
+	({
+		appLoaded: false,
+		activeChannel: undefined,
+		currentUserVisibleError: null,
+		desktopNotificationState: detectDesktopNotificationState(),
+		isAutoCompleting: false,
+		isConnected: false,
+		networks: [],
+		mentions: [],
+		hasServiceWorker: false,
+		pushNotificationState: "unsupported",
+		serverConfiguration: null,
+		sessions: [],
+		sidebarOpen: false,
+		sidebarDragging: false,
+		userlistOpen: storage.get("thelounge.state.userlist") !== "false",
+		versionData: null,
+		versionStatus: "loading",
+		versionDataExpired: false,
+		serverHasSettings: false,
+		messageSearchResults: null,
+		messageSearchInProgress: false,
+		searchEnabled: false,
+	} as State);
+
+type Getters = {
+	findChannelOnCurrentNetwork: (state: State) => (name: string) => ClientChan | undefined;
+	findChannelOnNetwork: (state: State) => (
+		networkUuid: string,
+		channelName: string
+	) => {
+		network: ClientNetwork;
+		channel: ClientChan;
+	} | null;
+	findChannel: (state: State) => (id: number) => {
+		network: ClientNetwork;
+		channel: ClientChan;
+	} | null;
+	findNetwork: (state: State) => (uuid: string) => ClientNetwork | null;
+	highlightCount(state: State): number;
+	title(state: State, getters: Omit<Getters, "title">): string;
+	initChannel: () => (channel: InitClientChan) => ClientChan;
+};
+
+// getters without the state argument
+export type CallableGetters = {
+	[K in keyof Getters]: ReturnType<Getters[K]>;
+};
+
+const getters: Getters = {
+	findChannelOnCurrentNetwork: (state) => (name: string) => {
+		name = name.toLowerCase();
+		return state.activeChannel?.network.channels.find((c) => c.name.toLowerCase() === name);
+	},
+	findChannelOnNetwork: (state) => (networkUuid: string, channelName: string) => {
+		for (const network of state.networks) {
+			if (network.uuid !== networkUuid) {
+				continue;
+			}
+
+			for (const channel of network.channels) {
+				if (channel.name === channelName) {
+					return {network, channel};
+				}
+			}
+		}
+
+		return null;
+	},
+	findChannel: (state) => (id: number) => {
+		for (const network of state.networks) {
+			for (const channel of network.channels) {
+				if (channel.id === id) {
+					return {network, channel};
+				}
+			}
+		}
+
+		return null;
+	},
+	findNetwork: (state) => (uuid: string) => {
+		for (const network of state.networks) {
+			if (network.uuid === uuid) {
+				return network;
+			}
+		}
+
+		return null;
+	},
+	highlightCount(state) {
+		let highlightCount = 0;
+
+		for (const network of state.networks) {
+			for (const channel of network.channels) {
+				if (channel.muted) {
+					continue;
+				}
+
+				highlightCount += channel.highlight;
+			}
+		}
+
+		return highlightCount;
+	},
+	title(state, getters) {
+		const alertEventCount = getters.highlightCount
+			? `(${getters.highlightCount.toString()}) `
+			: "";
+		const channelname = state.activeChannel ? `${state.activeChannel.channel.name} — ` : "";
+
+		return alertEventCount + channelname + appName;
+	},
+	initChannel: () => (channel: InitClientChan) => {
+		// TODO: This should be a mutation
+		channel.pendingMessage = "";
+		channel.inputHistoryPosition = 0;
+
+		channel.inputHistory = [""].concat(
+			channel.messages
+				.filter((m) => m.self && m.text && m.type === "message")
+				.map((m) => m.text)
+				.reverse()
+				.slice(0, 99)
+		);
+		channel.historyLoading = false;
+		channel.scrolledToBottom = true;
+		channel.editTopic = false;
+
+		channel.moreHistoryAvailable = channel.totalMessages! > channel.messages.length;
+		delete channel.totalMessages;
+
+		if (channel.type === "channel") {
+			channel.usersOutdated = true;
+		}
+
+		return channel as ClientChan;
+	},
+};
+
+type Mutations = {
+	appLoaded(state: State): void;
+	activeChannel(state: State, netChan: State["activeChannel"]): void;
+	currentUserVisibleError(state: State, error: State["currentUserVisibleError"]): void;
+	refreshDesktopNotificationState(state: State): void;
+	isAutoCompleting(state: State, isAutoCompleting: State["isAutoCompleting"]): void;
+	isConnected(state: State, payload: State["isConnected"]): void;
+	networks(state: State, networks: State["networks"]): void;
+	mentions(state: State, mentions: State["mentions"]): void;
+
+	removeNetwork(state: State, networkUuid: string): void;
+	sortNetworks(
+		state: State,
+		sortFn: (a: State["networks"][0], b: State["networks"][0]) => number
+	): void;
+	hasServiceWorker(state: State): void;
+	pushNotificationState(
+		state: State,
+		pushNotificationState: State["pushNotificationState"]
+	): void;
+	serverConfiguration(state: State, serverConfiguration: State["serverConfiguration"]): void;
+	sessions(state: State, payload: State["sessions"]): void;
+	sidebarOpen(state: State, payload: State["sidebarOpen"]): void;
+	sidebarDragging(state: State, payload: State["sidebarDragging"]): void;
+	toggleSidebar(state: State): void;
+	toggleUserlist(state: State): void;
+	userlistOpen(state: State, payload: State["userlistOpen"]): void;
+	versionData(state: State, payload: State["versionData"]): void;
+	versionStatus(state: State, payload: State["versionStatus"]): void;
+	versionDataExpired(state: State, payload: State["versionDataExpired"]): void;
+	serverHasSettings(state: State, value: State["serverHasSettings"]): void;
+	messageSearchInProgress(state: State, value: State["messageSearchInProgress"]): void;
+	messageSearchResults(state: State, value: State["messageSearchResults"]): void;
+	addMessageSearchResults(state: State, value: State["messageSearchResults"]): void;
+};
+
+const mutations: Mutations = {
+	appLoaded(state) {
+		state.appLoaded = true;
+	},
+	activeChannel(state, netChan) {
+		state.activeChannel = netChan;
+	},
+	currentUserVisibleError(state, error) {
+		state.currentUserVisibleError = error;
+	},
+	refreshDesktopNotificationState(state) {
+		state.desktopNotificationState = detectDesktopNotificationState();
+	},
+	isAutoCompleting(state, isAutoCompleting) {
+		state.isAutoCompleting = isAutoCompleting;
+	},
+	isConnected(state, payload) {
+		state.isConnected = payload;
+	},
+	networks(state, networks) {
+		state.networks = networks;
+	},
+	mentions(state, mentions) {
+		state.mentions = mentions;
+	},
+	removeNetwork(state, networkId) {
+		state.networks.splice(
+			state.networks.findIndex((n) => n.uuid === networkId),
+			1
+		);
+	},
+	sortNetworks(state, sortFn) {
+		state.networks.sort(sortFn);
+	},
+	hasServiceWorker(state) {
+		state.hasServiceWorker = true;
+	},
+	pushNotificationState(state, pushNotificationState) {
+		state.pushNotificationState = pushNotificationState;
+	},
+	serverConfiguration(state, serverConfiguration) {
+		state.serverConfiguration = serverConfiguration;
+	},
+	sessions(state, payload) {
+		state.sessions = payload;
+	},
+	sidebarOpen(state, payload) {
+		state.sidebarOpen = payload;
+	},
+	sidebarDragging(state, payload) {
+		state.sidebarDragging = payload;
+	},
+	toggleSidebar(state) {
+		state.sidebarOpen = !state.sidebarOpen;
+	},
+	toggleUserlist(state) {
+		state.userlistOpen = !state.userlistOpen;
+	},
+	userlistOpen(state, payload) {
+		state.userlistOpen = payload;
+	},
+	versionData(state, payload) {
+		state.versionData = payload;
+	},
+	versionStatus(state, payload) {
+		state.versionStatus = payload;
+	},
+	versionDataExpired(state, payload) {
+		state.versionDataExpired = payload;
+	},
+	serverHasSettings(state, value) {
+		state.serverHasSettings = value;
+	},
+	messageSearchInProgress(state, value) {
+		state.messageSearchInProgress = value;
+	},
+	messageSearchResults(state, value) {
+		state.messageSearchResults = value;
+	},
+	addMessageSearchResults(state, value) {
+		// Append the search results and add networks and channels to new messages
+		if (!state.messageSearchResults) {
+			state.messageSearchResults = {results: []};
+		}
+
+		if (!value) {
+			return;
+		}
+
+		const results = [...state.messageSearchResults.results, ...value.results];
+
+		state.messageSearchResults = {
+			results,
+		};
+	},
+};
+
+export type TypedCommit = <T extends keyof Mutations>(
+	type: T,
+	payload?: Parameters<Mutations[T]>[1] | null,
+	options?: {root?: boolean}
+) => ReturnType<Mutations[T]>;
+type TypedActionContext = Omit<ActionContext<State, State>, "commit"> & {
+	commit: TypedCommit;
+};
+
+type Actions = {
+	partChannel(context: TypedActionContext, payload: NetChan): void;
+};
+
+const actions: Actions = {
+	partChannel({commit, state}, netChan) {
+		const mentions = state.mentions.filter((msg) => !(msg.chanId === netChan.channel.id));
+		commit("mentions", mentions);
+	},
+};
+
+const storePattern = {
+	state,
+	mutations,
+	actions,
+	getters,
+};
+
+// https://vuex.vuejs.org/guide/typescript-support.html#typing-usestore-composition-function
+export const key: InjectionKey<Store<State>> = Symbol();
+
+// vuex types getters as any
+export type TypedStore = Omit<Store<State>, "getters" | "commit"> & {
+	getters: CallableGetters;
+	commit: TypedCommit;
+	state: State & {
+		settings: SettingsState;
+	};
+};
+
+export const store = createStore(storePattern) as TypedStore;
+
+const settingsStore = createSettingsStore(store);
+
+// Settings module is registered dynamically because it benefits
+// from a direct reference to the store
+store.registerModule("settings", settingsStore);
+
+export function useStore() {
+	return baseUseStore(key) as TypedStore;
+}
diff --git a/client/js/types.d.ts b/client/js/types.d.ts
new file mode 100644
index 00000000..c6502c53
--- /dev/null
+++ b/client/js/types.d.ts
@@ -0,0 +1,100 @@
+import {defineComponent} from "vue";
+
+import Chan from "../../server/models/chan";
+import Network from "../../server/models/network";
+import User from "../../server/models/user";
+import Message from "../../server/models/msg";
+import {Mention} from "../../server/client";
+import {ClientConfiguration} from "../../server/server";
+import {LinkPreview} from "../../server/plugins/irc-events/link";
+
+interface LoungeWindow extends Window {
+	g_TheLoungeRemoveLoading?: () => void;
+	navigator: Window["navigator"] & {
+		setAppBadge?: (highlightCount: number) => void;
+		clearAppBadge?: () => void;
+	};
+}
+
+type ClientUser = User & {
+	//
+};
+
+type ClientMessage = Omit<Message, "users"> & {
+	time: number;
+	users: string[];
+};
+
+type ClientChan = Omit<Chan, "users" | "messages"> & {
+	moreHistoryAvailable: boolean;
+	editTopic: boolean;
+	users: ClientUser[];
+	messages: ClientMessage[];
+
+	// these are added in store/initChannel
+	pendingMessage: string;
+	inputHistoryPosition: number;
+	inputHistory: string[];
+	historyLoading: boolean;
+	scrolledToBottom: boolean;
+	usersOutdated: boolean;
+};
+
+type InitClientChan = ClientChan & {
+	// total messages is deleted after its use when init event is sent/handled
+	totalMessages?: number;
+};
+
+// We omit channels so we can use ClientChan[] instead of Chan[]
+type ClientNetwork = Omit<Network, "channels"> & {
+	isJoinChannelShown: boolean;
+	isCollapsed: boolean;
+	channels: ClientChan[];
+};
+
+type NetChan = {
+	channel: ClientChan;
+	network: ClientNetwork;
+};
+
+type ClientConfiguration = ClientConfiguration;
+type ClientMention = Mention & {
+	localetime: string;
+	channel: NetChan | null;
+};
+
+type ClientLinkPreview = LinkPreview & {
+	sourceLoaded?: boolean;
+};
+
+declare module "vue-router" {
+	import Vue from "./vue";
+
+	interface Router {
+		app: Vue.VueApp;
+	}
+}
+
+interface BeforeInstallPromptEvent extends Event {
+	/**
+	 * Returns an array of DOMString items containing the platforms on which the event was dispatched.
+	 * This is provided for user agents that want to present a choice of versions to the user such as,
+	 * for example, "web" or "play" which would allow the user to chose between a web version or
+	 * an Android version.
+	 */
+	readonly platforms: Array<string>;
+
+	/**
+	 * Returns a Promise that resolves to a DOMString containing either "accepted" or "dismissed".
+	 */
+	readonly userChoice: Promise<{
+		outcome: "accepted" | "dismissed";
+		platform: string;
+	}>;
+
+	/**
+	 * Allows a developer to show the install prompt at a time of their own choosing.
+	 * This method returns a Promise.
+	 */
+	prompt(): Promise<void>;
+}
diff --git a/client/js/upload.js b/client/js/upload.ts
similarity index 73%
rename from client/js/upload.js
rename to client/js/upload.ts
index 2b42ed73..9b53a73c 100644
--- a/client/js/upload.js
+++ b/client/js/upload.ts
@@ -1,16 +1,17 @@
-"use strict";
-
 import {update as updateCursor} from "undate";
 
 import socket from "./socket";
-import store from "./store";
+import {store} from "./store";
 
 class Uploader {
-	init() {
-		this.xhr = null;
-		this.fileQueue = [];
-		this.tokenKeepAlive = null;
+	xhr: XMLHttpRequest | null = null;
+	fileQueue: File[] = [];
+	tokenKeepAlive: NodeJS.Timeout | null = null;
 
+	overlay: HTMLDivElement | null = null;
+	uploadProgressbar: HTMLSpanElement | null = null;
+
+	init() {
 		document.addEventListener("dragenter", (e) => this.dragEnter(e));
 		document.addEventListener("dragover", (e) => this.dragOver(e));
 		document.addEventListener("dragleave", (e) => this.dragLeave(e));
@@ -21,45 +22,45 @@ class Uploader {
 	}
 
 	mounted() {
-		this.overlay = document.getElementById("upload-overlay");
-		this.uploadProgressbar = document.getElementById("upload-progressbar");
+		this.overlay = document.getElementById("upload-overlay") as HTMLDivElement;
+		this.uploadProgressbar = document.getElementById("upload-progressbar") as HTMLSpanElement;
 	}
 
-	dragOver(event) {
-		if (event.dataTransfer.types.includes("Files")) {
+	dragOver(event: DragEvent) {
+		if (event.dataTransfer?.types.includes("Files")) {
 			// Prevent dragover event completely and do nothing with it
 			// This stops the browser from trying to guess which cursor to show
 			event.preventDefault();
 		}
 	}
 
-	dragEnter(event) {
+	dragEnter(event: DragEvent) {
 		// relatedTarget is the target where we entered the drag from
 		// when dragging from another window, the target is null, otherwise its a DOM element
-		if (!event.relatedTarget && event.dataTransfer.types.includes("Files")) {
+		if (!event.relatedTarget && event.dataTransfer?.types.includes("Files")) {
 			event.preventDefault();
 
-			this.overlay.classList.add("is-dragover");
+			this.overlay?.classList.add("is-dragover");
 		}
 	}
 
-	dragLeave(event) {
+	dragLeave(event: DragEvent) {
 		// If relatedTarget is null, that means we are no longer dragging over the page
 		if (!event.relatedTarget) {
 			event.preventDefault();
-			this.overlay.classList.remove("is-dragover");
+			this.overlay?.classList.remove("is-dragover");
 		}
 	}
 
-	drop(event) {
-		if (!event.dataTransfer.types.includes("Files")) {
+	drop(event: DragEvent) {
+		if (!event.dataTransfer?.types.includes("Files")) {
 			return;
 		}
 
 		event.preventDefault();
-		this.overlay.classList.remove("is-dragover");
+		this.overlay?.classList.remove("is-dragover");
 
-		let files;
+		let files: (File | null)[];
 
 		if (event.dataTransfer.items) {
 			files = Array.from(event.dataTransfer.items)
@@ -72,13 +73,17 @@ class Uploader {
 		this.triggerUpload(files);
 	}
 
-	paste(event) {
-		const items = event.clipboardData.items;
-		const files = [];
+	paste(event: ClipboardEvent) {
+		const items = event.clipboardData?.items;
+		const files: (File | null)[] = [];
 
-		for (const item of items) {
-			if (item.kind === "file") {
-				files.push(item.getAsFile());
+		if (!items) {
+			return;
+		}
+
+		for (let i = 0; i < items.length; i++) {
+			if (items[i].kind === "file") {
+				files.push(items[i].getAsFile());
 			}
 		}
 
@@ -90,7 +95,7 @@ class Uploader {
 		this.triggerUpload(files);
 	}
 
-	triggerUpload(files) {
+	triggerUpload(files: (File | null)[]) {
 		if (!files.length) {
 			return;
 		}
@@ -104,9 +109,13 @@ class Uploader {
 		}
 
 		const wasQueueEmpty = this.fileQueue.length === 0;
-		const maxFileSize = store.state.serverConfiguration.fileUploadMaxFileSize;
+		const maxFileSize = store.state.serverConfiguration?.fileUploadMaxFileSize || 0;
 
 		for (const file of files) {
+			if (!file) {
+				return;
+			}
+
 			if (maxFileSize > 0 && file.size > maxFileSize) {
 				this.handleResponse({
 					error: `File ${file.name} is over the maximum allowed size`,
@@ -129,14 +138,22 @@ class Uploader {
 		socket.emit("upload:auth");
 	}
 
-	setProgress(value) {
+	setProgress(value: number) {
+		if (!this.uploadProgressbar) {
+			return;
+		}
+
 		this.uploadProgressbar.classList.toggle("upload-progressbar-visible", value > 0);
-		this.uploadProgressbar.style.width = value + "%";
+		this.uploadProgressbar.style.width = `${value}%`;
 	}
 
-	uploadNextFileInQueue(token) {
+	uploadNextFileInQueue(token: string) {
 		const file = this.fileQueue.shift();
 
+		if (!file) {
+			return;
+		}
+
 		// Tell the server that we are still upload to this token
 		// so it does not become invalidated and fail the upload.
 		// This issue only happens if The Lounge is proxied through other software
@@ -155,7 +172,7 @@ class Uploader {
 		}
 	}
 
-	renderImage(file, callback) {
+	renderImage(file: File, callback: (file: File) => void) {
 		const fileReader = new FileReader();
 
 		fileReader.onabort = () => callback(file);
@@ -171,20 +188,25 @@ class Uploader {
 				canvas.width = img.width;
 				canvas.height = img.height;
 				const ctx = canvas.getContext("2d");
+
+				if (!ctx) {
+					throw new Error("Could not get canvas context in upload");
+				}
+
 				ctx.drawImage(img, 0, 0);
 
 				canvas.toBlob((blob) => {
-					callback(new File([blob], file.name));
+					callback(new File([blob!], file.name));
 				}, file.type);
 			};
 
-			img.src = fileReader.result;
+			img.src = String(fileReader.result);
 		};
 
 		fileReader.readAsDataURL(file);
 	}
 
-	performUpload(token, file) {
+	performUpload(token: string, file: File) {
 		this.xhr = new XMLHttpRequest();
 
 		this.xhr.upload.addEventListener(
@@ -197,7 +219,7 @@ class Uploader {
 		);
 
 		this.xhr.onreadystatechange = () => {
-			if (this.xhr.readyState === XMLHttpRequest.DONE) {
+			if (this.xhr?.readyState === XMLHttpRequest.DONE) {
 				let response;
 
 				try {
@@ -229,7 +251,7 @@ class Uploader {
 		this.xhr.send(formData);
 	}
 
-	handleResponse(response) {
+	handleResponse(response: {error?: string; url?: string}) {
 		this.setProgress(0);
 
 		if (this.tokenKeepAlive) {
@@ -247,16 +269,21 @@ class Uploader {
 		}
 	}
 
-	insertUploadUrl(url) {
-		const fullURL = new URL(url, location).toString();
+	insertUploadUrl(url: string) {
+		const fullURL = new URL(url, location.toString()).toString();
 		const textbox = document.getElementById("input");
+
+		if (!(textbox instanceof HTMLTextAreaElement)) {
+			throw new Error("Could not find textbox in upload");
+		}
+
 		const initStart = textbox.selectionStart;
 
 		// Get the text before the cursor, and add a space if it's not in the beginning
-		const headToCursor = initStart > 0 ? textbox.value.substr(0, initStart) + " " : "";
+		const headToCursor = initStart > 0 ? textbox.value.substring(0, initStart) + " " : "";
 
 		// Get the remaining text after the cursor
-		const cursorToTail = textbox.value.substr(initStart);
+		const cursorToTail = textbox.value.substring(initStart);
 
 		// Construct the value until the point where we want the cursor to be
 		const textBeforeTail = headToCursor + fullURL + " ";
diff --git a/client/js/vue.js b/client/js/vue.js
deleted file mode 100644
index 18f913da..00000000
--- a/client/js/vue.js
+++ /dev/null
@@ -1,118 +0,0 @@
-"use strict";
-
-const constants = require("./constants");
-
-import "../css/style.css";
-import Vue from "vue";
-import store from "./store";
-import App from "../components/App.vue";
-import storage from "./localStorage";
-import {router, navigate} from "./router";
-import socket from "./socket";
-import eventbus from "./eventbus";
-
-import "./socket-events";
-import "./webpush";
-import "./keybinds";
-
-const favicon = document.getElementById("favicon");
-const faviconNormal = favicon.getAttribute("href");
-const faviconAlerted = favicon.dataset.other;
-
-new Vue({
-	el: "#viewport",
-	router,
-	mounted() {
-		socket.open();
-	},
-	methods: {
-		switchToChannel(channel) {
-			navigate("RoutedChat", {id: channel.id});
-		},
-		closeChannel(channel) {
-			if (channel.type === "lobby") {
-				eventbus.emit(
-					"confirm-dialog",
-					{
-						title: "Remove network",
-						text: `Are you sure you want to quit and remove ${channel.name}? This cannot be undone.`,
-						button: "Remove network",
-					},
-					(result) => {
-						if (!result) {
-							return;
-						}
-
-						channel.closed = true;
-						socket.emit("input", {
-							target: Number(channel.id),
-							text: "/quit",
-						});
-					}
-				);
-
-				return;
-			}
-
-			channel.closed = true;
-
-			socket.emit("input", {
-				target: Number(channel.id),
-				text: "/close",
-			});
-		},
-	},
-	render(createElement) {
-		return createElement(App, {
-			ref: "app",
-			props: this,
-		});
-	},
-	store,
-});
-
-store.watch(
-	(state) => state.sidebarOpen,
-	(sidebarOpen) => {
-		if (window.innerWidth > constants.mobileViewportPixels) {
-			storage.set("thelounge.state.sidebar", sidebarOpen);
-			eventbus.emit("resize");
-		}
-	}
-);
-
-store.watch(
-	(state) => state.userlistOpen,
-	(userlistOpen) => {
-		storage.set("thelounge.state.userlist", userlistOpen);
-		eventbus.emit("resize");
-	}
-);
-
-store.watch(
-	(_, getters) => getters.title,
-	(title) => {
-		document.title = title;
-	}
-);
-
-// Toggles the favicon to red when there are unread notifications
-store.watch(
-	(_, getters) => getters.highlightCount,
-	(highlightCount) => {
-		favicon.setAttribute("href", highlightCount > 0 ? faviconAlerted : faviconNormal);
-
-		if (navigator.setAppBadge) {
-			if (highlightCount > 0) {
-				navigator.setAppBadge(highlightCount);
-			} else {
-				navigator.clearAppBadge();
-			}
-		}
-	}
-);
-
-Vue.config.errorHandler = function (e) {
-	store.commit("currentUserVisibleError", `Vue error: ${e.message}`);
-	console.error(e); // eslint-disable-line
-};
diff --git a/client/js/vue.ts b/client/js/vue.ts
new file mode 100644
index 00000000..3ebd5d9c
--- /dev/null
+++ b/client/js/vue.ts
@@ -0,0 +1,84 @@
+import constants from "./constants";
+
+import "../css/style.css";
+import {createApp} from "vue";
+import {store, CallableGetters, key} from "./store";
+import App from "../components/App.vue";
+import storage from "./localStorage";
+import {router, navigate} from "./router";
+import socket from "./socket";
+import eventbus from "./eventbus";
+
+import "./socket-events";
+import "./webpush";
+import "./keybinds";
+import {LoungeWindow} from "./types";
+
+const favicon = document.getElementById("favicon");
+const faviconNormal = favicon?.getAttribute("href") || "";
+const faviconAlerted = favicon?.dataset.other || "";
+
+export const VueApp = createApp(App);
+
+router.app = VueApp;
+VueApp.use(router);
+VueApp.use(store, key);
+
+VueApp.mount("#app");
+socket.open();
+
+store.watch(
+	(state) => state.sidebarOpen,
+	(sidebarOpen) => {
+		if (window.innerWidth > constants.mobileViewportPixels) {
+			storage.set("thelounge.state.sidebar", sidebarOpen.toString());
+			eventbus.emit("resize");
+		}
+	}
+);
+
+store.watch(
+	(state) => state.userlistOpen,
+	(userlistOpen) => {
+		storage.set("thelounge.state.userlist", userlistOpen.toString());
+		eventbus.emit("resize");
+	}
+);
+
+store.watch(
+	(_, getters: CallableGetters) => getters.title,
+	(title) => {
+		document.title = title;
+	}
+);
+
+// Toggles the favicon to red when there are unread notifications
+store.watch(
+	(_, getters: CallableGetters) => getters.highlightCount,
+	(highlightCount) => {
+		favicon?.setAttribute("href", highlightCount > 0 ? faviconAlerted : faviconNormal);
+
+		const nav: LoungeWindow["navigator"] = window.navigator;
+
+		if (nav.setAppBadge) {
+			if (highlightCount > 0) {
+				nav.setAppBadge(highlightCount);
+			} else {
+				if (nav.clearAppBadge) {
+					nav.clearAppBadge();
+				}
+			}
+		}
+	}
+);
+
+VueApp.config.errorHandler = function (e) {
+	if (e instanceof Error) {
+		store.commit("currentUserVisibleError", `Vue error: ${e.message}`);
+	} else {
+		store.commit("currentUserVisibleError", `Vue error: ${String(e)}`);
+	}
+
+	// eslint-disable-next-line no-console
+	console.error(e);
+};
diff --git a/client/js/webpush.js b/client/js/webpush.ts
similarity index 92%
rename from client/js/webpush.js
rename to client/js/webpush.ts
index 6f3f8ab7..6f86c5fb 100644
--- a/client/js/webpush.js
+++ b/client/js/webpush.ts
@@ -1,7 +1,5 @@
-"use strict";
-
 import socket from "./socket";
-import store from "./store";
+import {store} from "./store";
 
 export default {togglePushSubscription};
 
@@ -28,7 +26,7 @@ socket.once("push:issubscribed", function (hasSubscriptionOnServer) {
 				// If client has push registration but the server knows nothing about it,
 				// this subscription is broken and client has to register again
 				if (subscription && hasSubscriptionOnServer === false) {
-					subscription.unsubscribe().then((successful) => {
+					void subscription.unsubscribe().then((successful) => {
 						store.commit(
 							"pushNotificationState",
 							successful ? "supported" : "unsupported"
@@ -67,7 +65,7 @@ function togglePushSubscription() {
 
 				return registration.pushManager
 					.subscribe({
-						applicationServerKey: store.state.serverConfiguration.applicationServerKey,
+						applicationServerKey: store.state.serverConfiguration?.applicationServerKey,
 						userVisibleOnly: true,
 					})
 					.then((subscription) => {
diff --git a/client/service-worker.js b/client/service-worker.js
index eea74070..e6022696 100644
--- a/client/service-worker.js
+++ b/client/service-worker.js
@@ -1,3 +1,4 @@
+// @ts-nocheck
 // The Lounge - https://github.com/thelounge/thelounge
 /* global clients */
 "use strict";
diff --git a/client/shims-vue.d.ts b/client/shims-vue.d.ts
new file mode 100644
index 00000000..32971832
--- /dev/null
+++ b/client/shims-vue.d.ts
@@ -0,0 +1,7 @@
+// https://vuejs.github.io/vetur/guide/setup.html#vue3
+declare module "*.vue" {
+	import type {DefineComponent} from "vue";
+	// eslint-disable-next-line @typescript-eslint/ban-types
+	const component: DefineComponent<{}, {}, any>;
+	export default component;
+}
diff --git a/client/tsconfig.json b/client/tsconfig.json
new file mode 100644
index 00000000..d29fc35e
--- /dev/null
+++ b/client/tsconfig.json
@@ -0,0 +1,28 @@
+{
+  "extends": "../tsconfig.base.json" /* Path to base configuration file to inherit from. Requires TypeScript version 2.1 or later. */,
+  "include": [
+    "./**/*"
+  ] /* Specifies a list of glob patterns that match files to be included in compilation. If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. Requires TypeScript version 2.0 or later. */,
+  "files": [
+    "../package.json",
+    "../server/types/socket-events.d.ts",
+    "./js/helpers/fullnamemap.json",
+    "./js/helpers/simplemap.json",
+    "../server/helper.ts"
+  ] /* If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. When a 'files' property is specified, only those files and those specified by 'include' are included. */,
+  // "exclude": [],
+  "compilerOptions": {
+    "sourceMap": false /*Create source map files for emitted JavaScript files. See more: https://www.typescriptlang.org/tsconfig#sourceMap */,
+    "jsx": "preserve" /* Specify what JSX code is generated. */,
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+
+    // this enables stricter inference for data properties on `this`
+    "strict": true,
+    // if using webpack 2+ or rollup, to leverage tree shaking:
+    "module": "es2015",
+    "moduleResolution": "node",
+
+    // TODO: Remove eventually
+    "noImplicitAny": false /*Enable error reporting for expressions and declarations with an implied any type. See more: https://www.typescriptlang.org/tsconfig#noImplicitAny */
+  } /* Instructs the TypeScript compiler how to compile .ts files. */
+}
diff --git a/index.js b/index.js
index 05b2aa37..ce1f76c5 100755
--- a/index.js
+++ b/index.js
@@ -25,11 +25,14 @@ if (!require("semver").satisfies(process.version, pkg.engines.node)) {
 	process.exit(1);
 }
 
-const dns = require("dns");
+const fs = require("fs");
 
-// Set DNS result order early before anything that may depend on it happens.
-if (dns.setDefaultResultOrder) {
-	dns.setDefaultResultOrder("verbatim");
+if (fs.existsSync("./dist/server/index.js")) {
+	require("./dist/server/index.js");
+} else {
+	console.error(
+		"Files in ./dist/server/ not found. Please run `yarn build` before trying to run `node index.js`."
+	);
+
+	process.exit(1);
 }
-
-require("./src/command-line");
diff --git a/package.json b/package.json
index ce58b950..9f8b87a5 100644
--- a/package.json
+++ b/package.json
@@ -12,17 +12,20 @@
   },
   "homepage": "https://thelounge.chat/",
   "scripts": {
-    "build": "webpack",
+    "build:client": "webpack",
+    "build:server": "tsc -p server/tsconfig.json",
+    "build": "run-p --aggregate-output build:client build:server",
     "coverage": "run-s test:* && nyc --nycrc-path=test/.nycrc-report.json report",
-    "dev": "node index start --dev",
+    "dev": "cross-env NODE_ENV=development ts-node --project server/tsconfig.json server/index.ts start --dev",
     "format:prettier": "prettier --write \"**/*.*\"",
     "lint:check-eslint": "eslint-config-prettier .eslintrc.cjs",
-    "lint:eslint": "eslint . --ext .js,.vue --report-unused-disable-directives --color",
+    "lint:eslint": "eslint . --report-unused-disable-directives --color",
     "lint:prettier": "prettier --list-different \"**/*.*\"",
     "lint:stylelint": "stylelint --color \"client/**/*.css\"",
+    "lint": "run-p --aggregate-output --continue-on-error lint:*",
     "start": "node index start",
     "test": "run-p --aggregate-output --continue-on-error lint:* test:*",
-    "test:mocha": "webpack --mode=development && nyc --nycrc-path=test/.nycrc-mocha.json mocha --colors --config=test/.mocharc.yml",
+    "test:mocha": "cross-env NODE_ENV=test webpack --mode=development && cross-env NODE_ENV=test TS_NODE_PROJECT='./test/tsconfig.json' nyc --nycrc-path=test/.nycrc-mocha.json mocha --require ts-node/register --colors --config=test/.mocharc.yml",
     "watch": "webpack --watch"
   },
   "keywords": [
@@ -73,23 +76,53 @@
   },
   "devDependencies": {
     "@babel/core": "7.17.10",
+    "@babel/plugin-transform-runtime": "7.18.2",
     "@babel/preset-env": "7.17.10",
     "@fortawesome/fontawesome-free": "5.15.4",
-    "@textcomplete/core": "0.1.11",
+    "@istanbuljs/nyc-config-typescript": "1.0.2",
+    "@textcomplete/core": "0.1.10",
     "@textcomplete/textarea": "0.1.10",
-    "@vue/server-test-utils": "1.3.0",
-    "@vue/test-utils": "1.3.0",
+    "@types/bcryptjs": "2.4.2",
+    "@types/chai": "4.3.1",
+    "@types/cheerio": "0.22.31",
+    "@types/content-disposition": "0.5.4",
+    "@types/express": "4.17.13",
+    "@types/is-utf8": "0.2.0",
+    "@types/ldapjs": "2.2.2",
+    "@types/linkify-it": "3.0.2",
+    "@types/lodash": "4.14.182",
+    "@types/mime-types": "2.1.1",
+    "@types/mocha": "9.1.1",
+    "@types/mousetrap": "1.6.9",
+    "@types/node": "17.0.31",
+    "@types/read": "0.0.29",
+    "@types/semver": "7.3.9",
+    "@types/sortablejs": "1.13.0",
+    "@types/sqlite3": "3.1.8",
+    "@types/ua-parser-js": "0.7.36",
+    "@types/uuid": "8.3.4",
+    "@types/web-push": "3.3.2",
+    "@types/webpack-env": "1.16.4",
+    "@types/webpack-hot-middleware": "2.25.6",
+    "@types/ws": "8.5.3",
+    "@typescript-eslint/eslint-plugin": "5.22.0",
+    "@typescript-eslint/parser": "5.22.0",
+    "@vue/runtime-dom": "3.2.33",
+    "@vue/test-utils": "2.0.0",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
+    "babel-preset-typescript-vue3": "2.0.17",
     "chai": "4.3.6",
     "copy-webpack-plugin": "10.2.4",
+    "cross-env": "7.0.3",
     "css-loader": "6.5.1",
     "cssnano": "5.0.17",
     "dayjs": "1.10.8",
     "emoji-regex": "9.2.2",
-    "eslint": "8.8.0",
+    "eslint": "8.16.0",
     "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-vue": "8.4.0",
+    "eslint-define-config": "1.5.1",
+    "eslint-plugin-vue": "9.0.1",
     "fuzzy": "0.1.3",
     "husky": "4.3.8",
     "mini-css-extract-plugin": "2.5.3",
@@ -107,16 +140,19 @@
     "primer-tooltips": "2.0.0",
     "sinon": "13.0.0",
     "socket.io-client": "4.4.1",
+    "sortablejs": "1.15.0",
     "stylelint": "14.3.0",
     "stylelint-config-standard": "24.0.0",
+    "ts-loader": "9.3.0",
+    "ts-node": "10.7.0",
+    "ts-sinon": "2.0.2",
+    "typescript": "4.7.2",
     "undate": "0.3.0",
-    "vue": "2.6.14",
-    "vue-loader": "15.9.8",
-    "vue-router": "3.5.3",
-    "vue-server-renderer": "2.6.14",
-    "vue-template-compiler": "2.6.14",
-    "vuedraggable": "2.24.3",
-    "vuex": "3.6.2",
+    "vue": "3.2.35",
+    "vue-eslint-parser": "8.3.0",
+    "vue-loader": "17.0.0",
+    "vue-router": "4.0.15",
+    "vuex": "4.0.2",
     "webpack": "5.68.0",
     "webpack-cli": "4.9.2",
     "webpack-dev-middleware": "5.3.0",
@@ -126,8 +162,5 @@
     "hooks": {
       "pre-commit": "pretty-quick --staged"
     }
-  },
-  "resolutions": {
-    "sortablejs": "1.15.0"
   }
 }
diff --git a/scripts/changelog.js b/scripts/changelog.js
index 871e4ef0..12185a4d 100644
--- a/scripts/changelog.js
+++ b/scripts/changelog.js
@@ -53,7 +53,7 @@ const got = require("got");
 const dayjs = require("dayjs");
 const semver = require("semver");
 const util = require("util");
-const log = require("../src/log");
+const log = require("../server/log");
 const packageJson = require("../package.json");
 let token = process.env.CHANGELOG_TOKEN;
 
diff --git a/scripts/generate-config-doc.js b/scripts/generate-config-doc.js
index 882f2172..43e934f2 100644
--- a/scripts/generate-config-doc.js
+++ b/scripts/generate-config-doc.js
@@ -10,7 +10,7 @@
 
 const {readFileSync, writeFileSync} = require("fs");
 const colors = require("chalk");
-const log = require("../src/log");
+const log = require("../server/log");
 const {join} = require("path");
 const {spawnSync} = require("child_process");
 
diff --git a/server/client.ts b/server/client.ts
new file mode 100644
index 00000000..ce6b20ff
--- /dev/null
+++ b/server/client.ts
@@ -0,0 +1,864 @@
+import _ from "lodash";
+import UAParser from "ua-parser-js";
+import {v4 as uuidv4} from "uuid";
+import escapeRegExp from "lodash/escapeRegExp";
+import crypto from "crypto";
+import colors from "chalk";
+
+import log from "./log";
+import Chan, {Channel, ChanType} from "./models/chan";
+import Msg, {MessageType, UserInMessage} from "./models/msg";
+import Config from "./config";
+import constants from "../client/js/constants";
+
+import inputs from "./plugins/inputs";
+import PublicClient from "./plugins/packages/publicClient";
+import SqliteMessageStorage from "./plugins/messageStorage/sqlite";
+import TextFileMessageStorage from "./plugins/messageStorage/text";
+import Network, {IgnoreListItem, NetworkWithIrcFramework} from "./models/network";
+import ClientManager from "./clientManager";
+import {MessageStorage, SearchQuery} from "./plugins/messageStorage/types";
+
+type OrderItem = Chan["id"] | Network["uuid"];
+type Order = OrderItem[];
+
+const events = [
+	"away",
+	"cap",
+	"connection",
+	"unhandled",
+	"ctcp",
+	"chghost",
+	"error",
+	"help",
+	"info",
+	"invite",
+	"join",
+	"kick",
+	"list",
+	"mode",
+	"modelist",
+	"motd",
+	"message",
+	"names",
+	"nick",
+	"part",
+	"quit",
+	"sasl",
+	"topic",
+	"welcome",
+	"whois",
+];
+
+type ClientPushSubscription = {
+	endpoint: string;
+	keys: {
+		p256dh: string;
+		auth: string;
+	};
+};
+
+export type UserConfig = {
+	log: boolean;
+	password: string;
+	sessions: {
+		[token: string]: {
+			lastUse: number;
+			ip: string;
+			agent: string;
+			pushSubscription?: ClientPushSubscription;
+		};
+	};
+	clientSettings: {
+		[key: string]: any;
+	};
+	browser?: {
+		language?: string;
+		ip?: string;
+		hostname?: string;
+		isSecure?: boolean;
+	};
+};
+
+export type Mention = {
+	chanId: number;
+	msgId: number;
+	type: MessageType;
+	time: Date;
+	text: string;
+	from: UserInMessage;
+};
+
+class Client {
+	awayMessage!: string;
+	lastActiveChannel!: number;
+	attachedClients!: {
+		[socketId: string]: {token: string; openChannel: number};
+	};
+	config!: UserConfig & {
+		networks?: Network[];
+	};
+	id!: number;
+	idMsg!: number;
+	idChan!: number;
+	name!: string;
+	networks!: Network[];
+	mentions!: Mention[];
+	manager!: ClientManager;
+	messageStorage!: MessageStorage[];
+	highlightRegex!: RegExp | null;
+	highlightExceptionRegex!: RegExp | null;
+	messageProvider?: SqliteMessageStorage;
+
+	fileHash!: string;
+
+	constructor(manager: ClientManager, name?: string, config = {} as UserConfig) {
+		_.merge(this, {
+			awayMessage: "",
+			lastActiveChannel: -1,
+			attachedClients: {},
+			config: config,
+			id: uuidv4(),
+			idChan: 1,
+			idMsg: 1,
+			name: name,
+			networks: [],
+			mentions: [],
+			manager: manager,
+			messageStorage: [],
+			highlightRegex: null,
+			highlightExceptionRegex: null,
+			messageProvider: undefined,
+		});
+
+		const client = this;
+
+		client.config.log = Boolean(client.config.log);
+		client.config.password = String(client.config.password);
+
+		if (!Config.values.public && client.config.log) {
+			if (Config.values.messageStorage.includes("sqlite")) {
+				client.messageProvider = new SqliteMessageStorage(client);
+				client.messageStorage.push(client.messageProvider);
+			}
+
+			if (Config.values.messageStorage.includes("text")) {
+				client.messageStorage.push(new TextFileMessageStorage(client));
+			}
+
+			for (const messageStorage of client.messageStorage) {
+				messageStorage.enable();
+			}
+		}
+
+		if (!_.isPlainObject(client.config.sessions)) {
+			client.config.sessions = {};
+		}
+
+		if (!_.isPlainObject(client.config.clientSettings)) {
+			client.config.clientSettings = {};
+		}
+
+		if (!_.isPlainObject(client.config.browser)) {
+			client.config.browser = {};
+		}
+
+		if (client.config.clientSettings.awayMessage) {
+			client.awayMessage = client.config.clientSettings.awayMessage;
+		}
+
+		client.config.clientSettings.searchEnabled = client.messageProvider !== undefined;
+
+		client.compileCustomHighlights();
+
+		_.forOwn(client.config.sessions, (session) => {
+			if (session.pushSubscription) {
+				this.registerPushSubscription(session, session.pushSubscription, true);
+			}
+		});
+
+		(client.config.networks || []).forEach((network) => client.connect(network, true));
+
+		// Networks are stored directly in the client object
+		// We don't need to keep it in the config object
+		delete client.config.networks;
+
+		if (client.name) {
+			log.info(`User ${colors.bold(client.name)} loaded`);
+
+			// Networks are created instantly, but to reduce server load on startup
+			// We randomize the IRC connections and channel log loading
+			let delay = manager.clients.length * 500;
+			client.networks.forEach((network) => {
+				setTimeout(() => {
+					network.channels.forEach((channel) => channel.loadMessages(client, network));
+
+					if (!network.userDisconnected && network.irc) {
+						network.irc.connect();
+					}
+				}, delay);
+
+				delay += 1000 + Math.floor(Math.random() * 1000);
+			});
+
+			client.fileHash = manager.getDataToSave(client).newHash;
+		}
+	}
+
+	createChannel(attr: Partial<Chan>) {
+		const chan = new Chan(attr);
+		chan.id = this.idChan++;
+
+		return chan;
+	}
+
+	emit(event: string, data?: any) {
+		if (this.manager !== null) {
+			this.manager.sockets.in(this.id.toString()).emit(event, data);
+		}
+	}
+
+	find(channelId: number) {
+		let network: Network | null = null;
+		let chan: Chan | null | undefined = null;
+
+		for (const n of this.networks) {
+			chan = _.find(n.channels, {id: channelId});
+
+			if (chan) {
+				network = n;
+				break;
+			}
+		}
+
+		if (network && chan) {
+			return {network, chan};
+		}
+
+		return false;
+	}
+
+	connect(args: Record<string, any>, isStartup = false) {
+		const client = this;
+		let channels: Chan[] = [];
+
+		// Get channel id for lobby before creating other channels for nicer ids
+		const lobbyChannelId = client.idChan++;
+
+		if (Array.isArray(args.channels)) {
+			let badName = false;
+
+			args.channels.forEach((chan: Chan) => {
+				if (!chan.name) {
+					badName = true;
+					return;
+				}
+
+				channels.push(
+					client.createChannel({
+						name: chan.name,
+						key: chan.key || "",
+						type: chan.type,
+						muted: chan.muted,
+					})
+				);
+			});
+
+			if (badName && client.name) {
+				log.warn(
+					"User '" +
+						client.name +
+						"' on network '" +
+						String(args.name) +
+						"' has an invalid channel which has been ignored"
+				);
+			}
+			// `join` is kept for backwards compatibility when updating from versions <2.0
+			// also used by the "connect" window
+		} else if (args.join) {
+			channels = args.join
+				.replace(/,/g, " ")
+				.split(/\s+/g)
+				.map((chan: string) => {
+					if (!chan.match(/^[#&!+]/)) {
+						chan = `#${chan}`;
+					}
+
+					return client.createChannel({
+						name: chan,
+					});
+				});
+		}
+
+		// TODO; better typing for args
+		const network = new Network({
+			uuid: String(args.uuid),
+			name: String(
+				args.name || (Config.values.lockNetwork ? Config.values.defaults.name : "") || ""
+			),
+			host: String(args.host || ""),
+			port: parseInt(String(args.port), 10),
+			tls: !!args.tls,
+			userDisconnected: !!args.userDisconnected,
+			rejectUnauthorized: !!args.rejectUnauthorized,
+			password: String(args.password || ""),
+			nick: String(args.nick || ""),
+			username: String(args.username || ""),
+			realname: String(args.realname || ""),
+			leaveMessage: String(args.leaveMessage || ""),
+			sasl: String(args.sasl || ""),
+			saslAccount: String(args.saslAccount || ""),
+			saslPassword: String(args.saslPassword || ""),
+			commands: (args.commands as string[]) || [],
+			channels: channels,
+			ignoreList: args.ignoreList ? (args.ignoreList as IgnoreListItem[]) : [],
+
+			proxyEnabled: !!args.proxyEnabled,
+			proxyHost: String(args.proxyHost || ""),
+			proxyPort: parseInt(args.proxyPort, 10),
+			proxyUsername: String(args.proxyUsername || ""),
+			proxyPassword: String(args.proxyPassword || ""),
+		});
+
+		// Set network lobby channel id
+		network.channels[0].id = lobbyChannelId;
+
+		client.networks.push(network);
+		client.emit("network", {
+			networks: [network.getFilteredClone(this.lastActiveChannel, -1)],
+		});
+
+		if (!network.validate(client)) {
+			return;
+		}
+
+		(network as NetworkWithIrcFramework).createIrcFramework(client);
+
+		// TODO
+		// eslint-disable-next-line @typescript-eslint/no-misused-promises
+		events.forEach(async (plugin) => {
+			(await import(`./plugins/irc-events/${plugin}`)).default.apply(client, [
+				network.irc,
+				network,
+			]);
+		});
+
+		if (network.userDisconnected) {
+			network.channels[0].pushMessage(
+				client,
+				new Msg({
+					text: "You have manually disconnected from this network before, use the /connect command to connect again.",
+				}),
+				true
+			);
+		} else if (!isStartup) {
+			// irc is created in createIrcFramework
+			// TODO; fix type
+			network.irc!.connect();
+		}
+
+		if (!isStartup) {
+			client.save();
+			channels.forEach((channel) => channel.loadMessages(client, network));
+		}
+	}
+
+	generateToken(callback: (token: string) => void) {
+		crypto.randomBytes(64, (err, buf) => {
+			if (err) {
+				throw err;
+			}
+
+			callback(buf.toString("hex"));
+		});
+	}
+
+	calculateTokenHash(token: string) {
+		return crypto.createHash("sha512").update(token).digest("hex");
+	}
+
+	updateSession(token: string, ip: string, request: any) {
+		const client = this;
+		const agent = UAParser(request.headers["user-agent"] || "");
+		let friendlyAgent = "";
+
+		if (agent.browser.name) {
+			friendlyAgent = `${agent.browser.name} ${agent.browser.major || ""}`;
+		} else {
+			friendlyAgent = "Unknown browser";
+		}
+
+		if (agent.os.name) {
+			friendlyAgent += ` on ${agent.os.name}`;
+
+			if (agent.os.version) {
+				friendlyAgent += ` ${agent.os.version}`;
+			}
+		}
+
+		client.config.sessions[token] = _.assign(client.config.sessions[token], {
+			lastUse: Date.now(),
+			ip: ip,
+			agent: friendlyAgent,
+		});
+
+		client.save();
+	}
+
+	setPassword(hash: string, callback: (success: boolean) => void) {
+		const client = this;
+
+		const oldHash = client.config.password;
+		client.config.password = hash;
+		client.manager.saveUser(client, function (err) {
+			if (err) {
+				// If user file fails to write, reset it back
+				client.config.password = oldHash;
+				return callback(false);
+			}
+
+			return callback(true);
+		});
+	}
+
+	input(data) {
+		const client = this;
+		data.text.split("\n").forEach((line) => {
+			data.text = line;
+			client.inputLine(data);
+		});
+	}
+
+	inputLine(data) {
+		const client = this;
+		const target = client.find(data.target);
+
+		if (!target) {
+			return;
+		}
+
+		// Sending a message to a channel is higher priority than merely opening one
+		// so that reloading the page will open this channel
+		this.lastActiveChannel = target.chan.id;
+
+		let text: string = data.text;
+
+		// This is either a normal message or a command escaped with a leading '/'
+		if (text.charAt(0) !== "/" || text.charAt(1) === "/") {
+			if (target.chan.type === ChanType.LOBBY) {
+				target.chan.pushMessage(
+					this,
+					new Msg({
+						type: MessageType.ERROR,
+						text: "Messages can not be sent to lobbies.",
+					})
+				);
+				return;
+			}
+
+			text = "say " + text.replace(/^\//, "");
+		} else {
+			text = text.substring(1);
+		}
+
+		const args = text.split(" ");
+		const cmd = args?.shift()?.toLowerCase() || "";
+
+		const irc = target.network.irc;
+		let connected = irc && irc.connection && irc.connection.connected;
+
+		if (inputs.userInputs.has(cmd)) {
+			const plugin = inputs.userInputs.get(cmd);
+
+			if (!plugin) {
+				// should be a no-op
+				throw new Error(`Plugin ${cmd} not found`);
+			}
+
+			if (typeof plugin.input === "function" && (connected || plugin.allowDisconnected)) {
+				connected = true;
+				plugin.input.apply(client, [target.network, target.chan, cmd, args]);
+			}
+		} else if (inputs.pluginCommands.has(cmd)) {
+			const plugin = inputs.pluginCommands.get(cmd);
+
+			if (typeof plugin.input === "function" && (connected || plugin.allowDisconnected)) {
+				connected = true;
+				plugin.input(
+					new PublicClient(client, plugin.packageInfo),
+					{network: target.network, chan: target.chan},
+					cmd,
+					args
+				);
+			}
+		} else if (connected) {
+			// TODO: fix
+			irc!.raw(text);
+		}
+
+		if (!connected) {
+			target.chan.pushMessage(
+				this,
+				new Msg({
+					type: MessageType.ERROR,
+					text: "You are not connected to the IRC network, unable to send your command.",
+				})
+			);
+		}
+	}
+
+	compileCustomHighlights() {
+		function compileHighlightRegex(customHighlightString: string) {
+			if (typeof customHighlightString !== "string") {
+				return null;
+			}
+
+			// Ensure we don't have empty strings in the list of highlights
+			const highlightsTokens = customHighlightString
+				.split(",")
+				.map((highlight) => escapeRegExp(highlight.trim()))
+				.filter((highlight) => highlight.length > 0);
+
+			if (highlightsTokens.length === 0) {
+				return null;
+			}
+
+			return new RegExp(
+				`(?:^|[ .,+!?|/:<>(){}'"@&~-])(?:${highlightsTokens.join(
+					"|"
+				)})(?:$|[ .,+!?|/:<>(){}'"-])`,
+				"i"
+			);
+		}
+
+		this.highlightRegex = compileHighlightRegex(this.config.clientSettings.highlights);
+		this.highlightExceptionRegex = compileHighlightRegex(
+			this.config.clientSettings.highlightExceptions
+		);
+	}
+
+	more(data) {
+		const client = this;
+		const target = client.find(data.target);
+
+		if (!target) {
+			return null;
+		}
+
+		const chan = target.chan;
+		let messages: Msg[] = [];
+		let index = 0;
+
+		// If client requests -1, send last 100 messages
+		if (data.lastId < 0) {
+			index = chan.messages.length;
+		} else {
+			index = chan.messages.findIndex((val) => val.id === data.lastId);
+		}
+
+		// If requested id is not found, an empty array will be sent
+		if (index > 0) {
+			let startIndex = index;
+
+			if (data.condensed) {
+				// Limit to 1000 messages (that's 10x normal limit)
+				const indexToStop = Math.max(0, index - 1000);
+				let realMessagesLeft = 100;
+
+				for (let i = index - 1; i >= indexToStop; i--) {
+					startIndex--;
+
+					// Do not count condensed messages towards the 100 messages
+					if (constants.condensedTypes.has(chan.messages[i].type)) {
+						continue;
+					}
+
+					// Count up actual 100 visible messages
+					if (--realMessagesLeft === 0) {
+						break;
+					}
+				}
+			} else {
+				startIndex = Math.max(0, index - 100);
+			}
+
+			messages = chan.messages.slice(startIndex, index);
+		}
+
+		return {
+			chan: chan.id,
+			messages: messages,
+			totalMessages: chan.messages.length,
+		};
+	}
+
+	clearHistory(data) {
+		const client = this;
+		const target = client.find(data.target);
+
+		if (!target) {
+			return;
+		}
+
+		target.chan.messages = [];
+		target.chan.unread = 0;
+		target.chan.highlight = 0;
+		target.chan.firstUnread = 0;
+
+		client.emit("history:clear", {
+			target: target.chan.id,
+		});
+
+		if (!target.chan.isLoggable()) {
+			return;
+		}
+
+		for (const messageStorage of this.messageStorage) {
+			messageStorage.deleteChannel(target.network, target.chan);
+		}
+	}
+
+	search(query: SearchQuery) {
+		if (this.messageProvider === undefined) {
+			return Promise.resolve({
+				results: [],
+				target: "",
+				networkUuid: "",
+				offset: 0,
+				searchTerm: query?.searchTerm,
+			});
+		}
+
+		return this.messageProvider.search(query);
+	}
+
+	open(socketId: string, target: number) {
+		// Due to how socket.io works internally, normal events may arrive later than
+		// the disconnect event, and because we can't control this timing precisely,
+		// process this event normally even if there is no attached client anymore.
+		const attachedClient =
+			this.attachedClients[socketId] ||
+			({} as Record<string, typeof this.attachedClients[0]>);
+
+		// Opening a window like settings
+		if (target === null) {
+			attachedClient.openChannel = -1;
+			return;
+		}
+
+		const targetNetChan = this.find(target);
+
+		if (!targetNetChan) {
+			return;
+		}
+
+		targetNetChan.chan.unread = 0;
+		targetNetChan.chan.highlight = 0;
+
+		if (targetNetChan.chan.messages.length > 0) {
+			targetNetChan.chan.firstUnread =
+				targetNetChan.chan.messages[targetNetChan.chan.messages.length - 1].id;
+		}
+
+		attachedClient.openChannel = targetNetChan.chan.id;
+		this.lastActiveChannel = targetNetChan.chan.id;
+
+		this.emit("open", targetNetChan.chan.id);
+	}
+
+	sort(data: {order: Order; type: "networks" | "channels"; target: string}) {
+		const order = data.order;
+
+		if (!_.isArray(order)) {
+			return;
+		}
+
+		switch (data.type) {
+			case "networks":
+				this.networks.sort((a, b) => order.indexOf(a.uuid) - order.indexOf(b.uuid));
+
+				// Sync order to connected clients
+				this.emit("sync_sort", {
+					order: this.networks.map((obj) => obj.uuid),
+					type: data.type,
+				});
+
+				break;
+
+			case "channels": {
+				const network = _.find(this.networks, {uuid: data.target});
+
+				if (!network) {
+					return;
+				}
+
+				network.channels.sort((a, b) => {
+					// Always sort lobby to the top regardless of what the client has sent
+					// Because there's a lot of code that presumes channels[0] is the lobby
+					if (a.type === ChanType.LOBBY) {
+						return -1;
+					} else if (b.type === ChanType.LOBBY) {
+						return 1;
+					}
+
+					return order.indexOf(a.id) - order.indexOf(b.id);
+				});
+
+				// Sync order to connected clients
+				this.emit("sync_sort", {
+					order: network.channels.map((obj) => obj.id),
+					type: data.type,
+					target: network.uuid,
+				});
+
+				break;
+			}
+		}
+
+		this.save();
+	}
+
+	names(data: {target: number}) {
+		const client = this;
+		const target = client.find(data.target);
+
+		if (!target) {
+			return;
+		}
+
+		client.emit("names", {
+			id: target.chan.id,
+			users: target.chan.getSortedUsers(target.network.irc),
+		});
+	}
+
+	part(network: Network, chan: Chan) {
+		const client = this;
+		network.channels = _.without(network.channels, chan);
+		client.mentions = client.mentions.filter((msg) => !(msg.chanId === chan.id));
+		chan.destroy();
+		client.save();
+		client.emit("part", {
+			chan: chan.id,
+		});
+	}
+
+	quit(signOut?: boolean) {
+		const sockets = this.manager.sockets.sockets;
+		const room = sockets.adapter.rooms.get(this.id.toString());
+
+		if (room) {
+			for (const user of room) {
+				const socket = sockets.sockets.get(user);
+
+				if (socket) {
+					if (signOut) {
+						socket.emit("sign-out");
+					}
+
+					socket.disconnect();
+				}
+			}
+		}
+
+		this.networks.forEach((network) => {
+			network.quit();
+			network.destroy();
+		});
+
+		for (const messageStorage of this.messageStorage) {
+			messageStorage.close();
+		}
+	}
+
+	clientAttach(socketId: string, token: string) {
+		const client = this;
+
+		if (client.awayMessage && _.size(client.attachedClients) === 0) {
+			client.networks.forEach(function (network) {
+				// Only remove away on client attachment if
+				// there is no away message on this network
+				if (network.irc && !network.awayMessage) {
+					network.irc.raw("AWAY");
+				}
+			});
+		}
+
+		const openChannel = client.lastActiveChannel;
+		client.attachedClients[socketId] = {token, openChannel};
+	}
+
+	clientDetach(socketId: string) {
+		const client = this;
+
+		delete this.attachedClients[socketId];
+
+		if (client.awayMessage && _.size(client.attachedClients) === 0) {
+			client.networks.forEach(function (network) {
+				// Only set away on client deattachment if
+				// there is no away message on this network
+				if (network.irc && !network.awayMessage) {
+					network.irc.raw("AWAY", client.awayMessage);
+				}
+			});
+		}
+	}
+
+	// TODO: type session to this.attachedClients
+	registerPushSubscription(session: any, subscription: ClientPushSubscription, noSave = false) {
+		if (
+			!_.isPlainObject(subscription) ||
+			!_.isPlainObject(subscription.keys) ||
+			typeof subscription.endpoint !== "string" ||
+			!/^https?:\/\//.test(subscription.endpoint) ||
+			typeof subscription.keys.p256dh !== "string" ||
+			typeof subscription.keys.auth !== "string"
+		) {
+			session.pushSubscription = null;
+			return;
+		}
+
+		const data = {
+			endpoint: subscription.endpoint,
+			keys: {
+				p256dh: subscription.keys.p256dh,
+				auth: subscription.keys.auth,
+			},
+		};
+
+		session.pushSubscription = data;
+
+		if (!noSave) {
+			this.save();
+		}
+
+		return data;
+	}
+
+	unregisterPushSubscription(token: string) {
+		this.config.sessions[token].pushSubscription = undefined;
+		this.save();
+	}
+
+	save = _.debounce(
+		function SaveClient(this: Client) {
+			if (Config.values.public) {
+				return;
+			}
+
+			const client = this;
+			client.manager.saveUser(client);
+		},
+		5000,
+		{maxWait: 20000}
+	);
+}
+
+export default Client;
+
+// TODO: this should exist elsewhere?
+export type IrcEventHandler = (
+	this: Client,
+	irc: NetworkWithIrcFramework["irc"],
+	network: NetworkWithIrcFramework
+) => void;
diff --git a/server/clientManager.ts b/server/clientManager.ts
new file mode 100644
index 00000000..705fa432
--- /dev/null
+++ b/server/clientManager.ts
@@ -0,0 +1,296 @@
+import _ from "lodash";
+import colors from "chalk";
+import crypto from "crypto";
+import fs from "fs";
+import path from "path";
+
+import Auth from "./plugins/auth";
+import Client, {UserConfig} from "./client";
+import Config from "./config";
+import WebPush from "./plugins/webpush";
+import log from "./log";
+import {Server} from "socket.io";
+
+class ClientManager {
+	clients: Client[];
+	sockets!: Server;
+	identHandler: any;
+	webPush!: WebPush;
+
+	constructor() {
+		this.clients = [];
+	}
+
+	init(identHandler, sockets: Server) {
+		this.sockets = sockets;
+		this.identHandler = identHandler;
+		this.webPush = new WebPush();
+
+		if (!Config.values.public) {
+			this.loadUsers();
+
+			// LDAP does not have user commands, and users are dynamically
+			// created upon logon, so we don't need to watch for new files
+			if (!Config.values.ldap.enable) {
+				this.autoloadUsers();
+			}
+		}
+	}
+
+	findClient(name: string) {
+		name = name.toLowerCase();
+		return this.clients.find((u) => u.name.toLowerCase() === name);
+	}
+
+	loadUsers() {
+		let users = this.getUsers();
+
+		if (users.length === 0) {
+			log.info(
+				`There are currently no users. Create one with ${colors.bold(
+					"thelounge add <name>"
+				)}.`
+			);
+
+			return;
+		}
+
+		const alreadySeenUsers = new Set();
+		users = users.filter((user) => {
+			user = user.toLowerCase();
+
+			if (alreadySeenUsers.has(user)) {
+				log.error(
+					`There is more than one user named "${colors.bold(
+						user
+					)}". Usernames are now case insensitive, duplicate users will not load.`
+				);
+
+				return false;
+			}
+
+			alreadySeenUsers.add(user);
+
+			return true;
+		});
+
+		// This callback is used by Auth plugins to load users they deem acceptable
+		const callbackLoadUser = (user) => {
+			this.loadUser(user);
+		};
+
+		if (!Auth.loadUsers(users, callbackLoadUser)) {
+			// Fallback to loading all users
+			users.forEach((name) => this.loadUser(name));
+		}
+	}
+
+	autoloadUsers() {
+		fs.watch(
+			Config.getUsersPath(),
+			_.debounce(
+				() => {
+					const loaded = this.clients.map((c) => c.name);
+					const updatedUsers = this.getUsers();
+
+					if (updatedUsers.length === 0) {
+						log.info(
+							`There are currently no users. Create one with ${colors.bold(
+								"thelounge add <name>"
+							)}.`
+						);
+					}
+
+					// Reload all users. Existing users will only have their passwords reloaded.
+					updatedUsers.forEach((name) => this.loadUser(name));
+
+					// Existing users removed since last time users were loaded
+					_.difference(loaded, updatedUsers).forEach((name) => {
+						const client = _.find(this.clients, {name});
+
+						if (client) {
+							client.quit(true);
+							this.clients = _.without(this.clients, client);
+							log.info(`User ${colors.bold(name)} disconnected and removed.`);
+						}
+					});
+				},
+				1000,
+				{maxWait: 10000}
+			)
+		);
+	}
+
+	loadUser(name: string) {
+		const userConfig = this.readUserConfig(name);
+
+		if (!userConfig) {
+			return;
+		}
+
+		let client = this.findClient(name);
+
+		if (client) {
+			if (userConfig.password !== client.config.password) {
+				/**
+				 * If we happen to reload an existing client, make super duper sure we
+				 * have their latest password. We're not replacing the entire config
+				 * object, because that could have undesired consequences.
+				 *
+				 * @see https://github.com/thelounge/thelounge/issues/598
+				 */
+				client.config.password = userConfig.password;
+				log.info(`Password for user ${colors.bold(name)} was reset.`);
+			}
+		} else {
+			client = new Client(this, name, userConfig);
+			this.clients.push(client);
+		}
+
+		return client;
+	}
+
+	getUsers = function () {
+		if (!fs.existsSync(Config.getUsersPath())) {
+			return [];
+		}
+
+		return fs
+			.readdirSync(Config.getUsersPath())
+			.filter((file) => file.endsWith(".json"))
+			.map((file) => file.slice(0, -5));
+	};
+
+	addUser(name: string, password: string | null, enableLog?: boolean) {
+		if (path.basename(name) !== name) {
+			throw new Error(`${name} is an invalid username.`);
+		}
+
+		const userPath = Config.getUserConfigPath(name);
+
+		if (fs.existsSync(userPath)) {
+			log.error(`User ${colors.green(name)} already exists.`);
+			return false;
+		}
+
+		const user = {
+			password: password || "",
+			log: enableLog,
+		};
+
+		try {
+			fs.writeFileSync(userPath, JSON.stringify(user, null, "\t"), {
+				mode: 0o600,
+			});
+		} catch (e: any) {
+			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+			log.error(`Failed to create user ${colors.green(name)} (${e})`);
+			throw e;
+		}
+
+		try {
+			const userFolderStat = fs.statSync(Config.getUsersPath());
+			const userFileStat = fs.statSync(userPath);
+
+			if (
+				userFolderStat &&
+				userFileStat &&
+				(userFolderStat.uid !== userFileStat.uid || userFolderStat.gid !== userFileStat.gid)
+			) {
+				log.warn(
+					`User ${colors.green(
+						name
+					)} has been created, but with a different uid (or gid) than expected.`
+				);
+				log.warn(
+					"The file owner has been changed to the expected user. " +
+						"To prevent any issues, please run thelounge commands " +
+						"as the correct user that owns the config folder."
+				);
+				log.warn(
+					"See https://thelounge.chat/docs/usage#using-the-correct-system-user for more information."
+				);
+				fs.chownSync(userPath, userFolderStat.uid, userFolderStat.gid);
+			}
+		} catch (e: any) {
+			// We're simply verifying file owner as a safe guard for users
+			// that run `thelounge add` as root, so we don't care if it fails
+		}
+
+		return true;
+	}
+
+	getDataToSave(client: Client) {
+		const json = Object.assign({}, client.config, {
+			networks: client.networks.map((n) => n.export()),
+		});
+		const newUser = JSON.stringify(json, null, "\t");
+		const newHash = crypto.createHash("sha256").update(newUser).digest("hex");
+
+		return {newUser, newHash};
+	}
+
+	saveUser(client: Client, callback?: (err?: any) => void) {
+		const {newUser, newHash} = this.getDataToSave(client);
+
+		// Do not write to disk if the exported data hasn't actually changed
+		if (client.fileHash === newHash) {
+			return;
+		}
+
+		const pathReal = Config.getUserConfigPath(client.name);
+		const pathTemp = pathReal + ".tmp";
+
+		try {
+			// Write to a temp file first, in case the write fails
+			// we do not lose the original file (for example when disk is full)
+			fs.writeFileSync(pathTemp, newUser, {
+				mode: 0o600,
+			});
+			fs.renameSync(pathTemp, pathReal);
+
+			return callback ? callback() : true;
+		} catch (e: any) {
+			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+			log.error(`Failed to update user ${colors.green(client.name)} (${e})`);
+
+			if (callback) {
+				callback(e);
+			}
+		}
+	}
+
+	removeUser(name) {
+		const userPath = Config.getUserConfigPath(name);
+
+		if (!fs.existsSync(userPath)) {
+			log.error(`Tried to remove non-existing user ${colors.green(name)}.`);
+			return false;
+		}
+
+		fs.unlinkSync(userPath);
+
+		return true;
+	}
+
+	private readUserConfig(name: string) {
+		const userPath = Config.getUserConfigPath(name);
+
+		if (!fs.existsSync(userPath)) {
+			log.error(`Tried to read non-existing user ${colors.green(name)}`);
+			return false;
+		}
+
+		try {
+			const data = fs.readFileSync(userPath, "utf-8");
+			return JSON.parse(data) as UserConfig;
+		} catch (e: any) {
+			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+			log.error(`Failed to read user ${colors.bold(name)}: ${e}`);
+		}
+
+		return false;
+	}
+}
+
+export default ClientManager;
diff --git a/src/command-line/index.js b/server/command-line/index.ts
similarity index 79%
rename from src/command-line/index.js
rename to server/command-line/index.ts
index cfea187e..e164e63a 100644
--- a/src/command-line/index.js
+++ b/server/command-line/index.ts
@@ -1,14 +1,14 @@
-"use strict";
-
-const log = require("../log");
-const fs = require("fs");
-const path = require("path");
-const colors = require("chalk");
-const program = require("commander");
-const Helper = require("../helper");
-const Config = require("../config");
-const Utils = require("./utils");
+/* eslint-disable @typescript-eslint/no-var-requires */
+import log from "../log";
+import fs from "fs";
+import path from "path";
+import colors from "chalk";
+import {Command} from "commander";
+import Helper from "../helper";
+import Config from "../config";
+import Utils from "./utils";
 
+const program = new Command("thelounge");
 program
 	.version(Helper.getVersion(), "-v, --version")
 	.option(
@@ -26,7 +26,7 @@ Config.setHome(process.env.THELOUNGE_HOME || Utils.defaultHome());
 // Check config file owner and warn if we're running under a different user
 try {
 	verifyFileOwner();
-} catch (e) {
+} catch (e: any) {
 	// We do not care about failures of these checks
 	// fs.statSync will throw if config.js does not exist (e.g. first run)
 }
@@ -37,17 +37,20 @@ createPackagesFolder();
 // Merge config key-values passed as CLI options into the main config
 Config.merge(program.opts().config);
 
-require("./start");
+program.addCommand(require("./start").default);
+program.addCommand(require("./install").default);
+program.addCommand(require("./uninstall").default);
+program.addCommand(require("./upgrade").default);
+program.addCommand(require("./outdated").default);
 
 if (!Config.values.public) {
-	require("./users");
+	require("./users").default.forEach((command: Command) => {
+		if (command) {
+			program.addCommand(command);
+		}
+	});
 }
 
-require("./install");
-require("./uninstall");
-require("./upgrade");
-require("./outdated");
-
 // `parse` expects to be passed `process.argv`, but we need to remove to give it
 // a version of `argv` that does not contain options already parsed by
 // `parseOptions` above.
@@ -111,3 +114,5 @@ function verifyFileOwner() {
 		);
 	}
 }
+
+export default program;
diff --git a/src/command-line/install.js b/server/command-line/install.ts
similarity index 69%
rename from src/command-line/install.js
rename to server/command-line/install.ts
index e85e8fed..b5c607a5 100644
--- a/src/command-line/install.js
+++ b/server/command-line/install.ts
@@ -1,22 +1,29 @@
-"use strict";
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+import log from "../log";
+import colors from "chalk";
+import semver from "semver";
+import Helper from "../helper";
+import Config from "../config";
+import Utils from "./utils";
+import {Command} from "commander";
+import {FullMetadata} from "package-json";
 
-const log = require("../log");
-const colors = require("chalk");
-const semver = require("semver");
-const program = require("commander");
-const Helper = require("../helper");
-const Config = require("../config");
-const Utils = require("./utils");
+type CustomMetadata = FullMetadata & {
+	thelounge: {
+		supports: string;
+	};
+};
 
+const program = new Command("install");
 program
-	.command("install <package>")
+	.argument("<package>", "package to install")
 	.description("Install a theme or a package")
 	.on("--help", Utils.extraHelp)
-	.action(function (packageName) {
-		const fs = require("fs");
+	.action(async function (packageName: string) {
+		const fs = await import("fs");
 		const fspromises = fs.promises;
-		const path = require("path");
-		const packageJson = require("package-json");
+		const path = await import("path");
+		const packageJson = await import("package-json");
 
 		if (!fs.existsSync(Config.getConfigPath())) {
 			log.error(`${Config.getConfigPath()} does not exist.`);
@@ -24,27 +31,33 @@ program
 		}
 
 		log.info("Retrieving information about the package...");
-		let readFile = null;
+		// TODO: type
+		let readFile: any = null;
 		let isLocalFile = false;
 
 		if (packageName.startsWith("file:")) {
 			isLocalFile = true;
 			readFile = fspromises
 				.readFile(path.join(packageName.substr("file:".length), "package.json"), "utf-8")
-				.then((data) => JSON.parse(data));
+				.then((data) => JSON.parse(data) as typeof packageJson);
 		} else {
 			const split = packageName.split("@");
 			packageName = split[0];
 			const packageVersion = split[1] || "latest";
 
-			readFile = packageJson(packageName, {
+			readFile = packageJson.default(packageName, {
 				fullMetadata: true,
 				version: packageVersion,
 			});
 		}
 
+		if (!readFile) {
+			// no-op, error should've been thrown before this point
+			return;
+		}
+
 		readFile
-			.then((json) => {
+			.then((json: CustomMetadata) => {
 				const humanVersion = isLocalFile ? packageName : `${json.name} v${json.version}`;
 
 				if (!("thelounge" in json)) {
@@ -92,3 +105,5 @@ program
 				process.exit(1);
 			});
 	});
+
+export default program;
diff --git a/src/command-line/outdated.js b/server/command-line/outdated.ts
similarity index 68%
rename from src/command-line/outdated.js
rename to server/command-line/outdated.ts
index 72c561d4..8128cc36 100644
--- a/src/command-line/outdated.js
+++ b/server/command-line/outdated.ts
@@ -1,12 +1,10 @@
-"use strict";
-
-const program = require("commander");
-const Utils = require("./utils");
-const packageManager = require("../plugins/packages");
-const log = require("../log");
+import {Command} from "commander";
+import Utils from "./utils";
+import packageManager from "../plugins/packages";
+import log from "../log";
 
+const program = new Command("outdated");
 program
-	.command("outdated")
 	.description("Check for any outdated packages")
 	.on("--help", Utils.extraHelp)
 	.action(async () => {
@@ -25,3 +23,5 @@ program
 				log.error("Error finding outdated packages.");
 			});
 	});
+
+export default program;
diff --git a/src/command-line/start.js b/server/command-line/start.ts
similarity index 61%
rename from src/command-line/start.js
rename to server/command-line/start.ts
index 2ccb3a3a..6ad67854 100644
--- a/src/command-line/start.js
+++ b/server/command-line/start.ts
@@ -1,23 +1,23 @@
-"use strict";
-
-const log = require("../log");
-const colors = require("chalk");
-const fs = require("fs");
-const path = require("path");
-const program = require("commander");
-const Config = require("../config");
-const Utils = require("./utils");
+import log from "../log";
+import colors from "chalk";
+import fs from "fs";
+import path from "path";
+import {Command} from "commander";
+import Config from "../config";
+import Utils from "./utils";
 
+const program = new Command("start");
 program
-	.command("start")
 	.description("Start the server")
 	.option("--dev", "Development mode with hot module reloading")
 	.on("--help", Utils.extraHelp)
 	.action(function (options) {
 		initalizeConfig();
 
-		const server = require("../server");
-		server(options);
+		const newLocal = "../server";
+		// eslint-disable-next-line @typescript-eslint/no-var-requires
+		const server = require(newLocal);
+		server.default(options);
 	});
 
 function initalizeConfig() {
@@ -33,3 +33,5 @@ function initalizeConfig() {
 
 	fs.mkdirSync(Config.getUsersPath(), {recursive: true, mode: 0o700});
 }
+
+export default program;
diff --git a/server/command-line/uninstall.ts b/server/command-line/uninstall.ts
new file mode 100644
index 00000000..8f3988ff
--- /dev/null
+++ b/server/command-line/uninstall.ts
@@ -0,0 +1,42 @@
+import log from "../log";
+import colors from "chalk";
+import {Command} from "commander";
+import Config from "../config";
+import Utils from "./utils";
+
+const program = new Command("uninstall");
+program
+	.argument("<package>", "The package to uninstall")
+	.description("Uninstall a theme or a package")
+	.on("--help", Utils.extraHelp)
+	.action(async function (packageName: string) {
+		// eslint-disable-next-line @typescript-eslint/no-var-requires
+		const fs = require("fs").promises;
+		// eslint-disable-next-line @typescript-eslint/no-var-requires
+		const path = require("path");
+
+		const packagesConfig = path.join(Config.getPackagesPath(), "package.json");
+		// const packages = JSON.parse(fs.readFileSync(packagesConfig, "utf-8"));
+		const packages = JSON.parse(await fs.readFile(packagesConfig, "utf-8"));
+
+		if (
+			!packages.dependencies ||
+			!Object.prototype.hasOwnProperty.call(packages.dependencies, packageName)
+		) {
+			log.warn(`${colors.green(packageName)} is not installed.`);
+			process.exit(1);
+		}
+
+		log.info(`Uninstalling ${colors.green(packageName)}...`);
+
+		try {
+			await Utils.executeYarnCommand("remove", packageName);
+			log.info(`${colors.green(packageName)} has been successfully uninstalled.`);
+		} catch (code_1) {
+			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+			log.error(`Failed to uninstall ${colors.green(packageName)}. Exit code: ${code_1}`);
+			process.exit(1);
+		}
+	});
+
+export default program;
diff --git a/src/command-line/upgrade.js b/server/command-line/upgrade.ts
similarity index 71%
rename from src/command-line/upgrade.js
rename to server/command-line/upgrade.ts
index 57cc65b4..fafdcfb5 100644
--- a/src/command-line/upgrade.js
+++ b/server/command-line/upgrade.ts
@@ -1,13 +1,13 @@
-"use strict";
-
-const log = require("../log");
-const colors = require("chalk");
-const program = require("commander");
-const Config = require("../config");
-const Utils = require("./utils");
+/* eslint-disable @typescript-eslint/no-var-requires */
+import log from "../log";
+import colors from "chalk";
+import {Command} from "commander";
+import Config from "../config";
+import Utils from "./utils";
 
+const program = new Command("upgrade");
 program
-	.command("upgrade [packages...]")
+	.arguments("[packages...]")
 	.description("Upgrade installed themes and packages to their latest versions")
 	.on("--help", Utils.extraHelp)
 	.action(function (packages) {
@@ -48,12 +48,21 @@ program
 			return;
 		}
 
-		return Utils.executeYarnCommand(...argsList)
+		const command = argsList.shift();
+		const params = argsList;
+
+		if (!command) {
+			return;
+		}
+
+		return Utils.executeYarnCommand(command, ...params)
 			.then(() => {
 				log.info("Package(s) have been successfully upgraded.");
 			})
 			.catch((code) => {
-				log.error(`Failed to upgrade package(s). Exit code ${code}`);
+				log.error(`Failed to upgrade package(s). Exit code ${String(code)}`);
 				process.exit(1);
 			});
 	});
+
+export default program;
diff --git a/src/command-line/users/add.js b/server/command-line/users/add.ts
similarity index 81%
rename from src/command-line/users/add.js
rename to server/command-line/users/add.ts
index 98140e16..28e40567 100644
--- a/src/command-line/users/add.js
+++ b/server/command-line/users/add.ts
@@ -1,25 +1,25 @@
-"use strict";
-
-const log = require("../../log");
-const colors = require("chalk");
-const program = require("commander");
-const fs = require("fs");
-const Helper = require("../../helper");
-const Config = require("../../config");
-const Utils = require("../utils");
+import log from "../../log";
+import colors from "chalk";
+import {Command} from "commander";
+import fs from "fs";
+import Helper from "../../helper";
+import Config from "../../config";
+import Utils from "../utils";
 
+const program = new Command("add");
 program
-	.command("add <name>")
 	.description("Add a new user")
 	.on("--help", Utils.extraHelp)
 	.option("--password [password]", "new password, will be prompted if not specified")
 	.option("--save-logs", "if password is specified, this enables saving logs to disk")
+	.argument("<name>", "name of the user")
 	.action(function (name, cmdObj) {
 		if (!fs.existsSync(Config.getUsersPath())) {
 			log.error(`${Config.getUsersPath()} does not exist.`);
 			return;
 		}
 
+		// eslint-disable-next-line @typescript-eslint/no-var-requires
 		const ClientManager = require("../../clientManager");
 		const manager = new ClientManager();
 		const users = manager.getUsers();
@@ -79,3 +79,5 @@ function add(manager, name, password, enableLog) {
 	log.info(`User ${colors.bold(name)} created.`);
 	log.info(`User file located at ${colors.green(Config.getUserConfigPath(name))}.`);
 }
+
+export default program;
diff --git a/src/command-line/users/edit.js b/server/command-line/users/edit.ts
similarity index 71%
rename from src/command-line/users/edit.js
rename to server/command-line/users/edit.ts
index 0e9f4705..4529b494 100644
--- a/src/command-line/users/edit.js
+++ b/server/command-line/users/edit.ts
@@ -1,16 +1,15 @@
-"use strict";
-
-const log = require("../../log");
-const program = require("commander");
-const child = require("child_process");
-const colors = require("chalk");
-const fs = require("fs");
-const Config = require("../../config");
-const Utils = require("../utils");
+import log from "../../log";
+import {Command} from "commander";
+import child from "child_process";
+import colors from "chalk";
+import fs from "fs";
+import Config from "../../config";
+import Utils from "../utils";
 
+const program = new Command("edit");
 program
-	.command("edit <name>")
 	.description(`Edit user file located at ${colors.green(Config.getUserConfigPath("<name>"))}`)
+	.argument("<name>", "name of the user")
 	.on("--help", Utils.extraHelp)
 	.action(function (name) {
 		if (!fs.existsSync(Config.getUsersPath())) {
@@ -18,6 +17,7 @@ program
 			return;
 		}
 
+		// eslint-disable-next-line @typescript-eslint/no-var-requires
 		const ClientManager = require("../../clientManager");
 		const users = new ClientManager().getUsers();
 
@@ -44,3 +44,5 @@ program
 			);
 		});
 	});
+
+export default program;
diff --git a/server/command-line/users/index.ts b/server/command-line/users/index.ts
new file mode 100644
index 00000000..9f3c81bf
--- /dev/null
+++ b/server/command-line/users/index.ts
@@ -0,0 +1,15 @@
+import Config from "../../config";
+let add, reset;
+
+if (!Config.values.ldap.enable) {
+	// eslint-disable-next-line @typescript-eslint/no-var-requires
+	add = require("./add").default;
+	// eslint-disable-next-line @typescript-eslint/no-var-requires
+	reset = require("./reset").default;
+}
+
+import list from "./list";
+import remove from "./remove";
+import edit from "./edit";
+
+export default [list, remove, edit, add, reset];
diff --git a/src/command-line/users/list.js b/server/command-line/users/list.ts
similarity index 63%
rename from src/command-line/users/list.js
rename to server/command-line/users/list.ts
index dc8da7fe..4389f9bc 100644
--- a/src/command-line/users/list.js
+++ b/server/command-line/users/list.ts
@@ -1,16 +1,14 @@
-"use strict";
-
-const log = require("../../log");
-const colors = require("chalk");
-const program = require("commander");
-const Utils = require("../utils");
+import log from "../../log";
+import colors from "chalk";
+import {Command} from "commander";
+import Utils from "../utils";
 
+const program = new Command("list");
 program
-	.command("list")
 	.description("List all users")
 	.on("--help", Utils.extraHelp)
-	.action(function () {
-		const ClientManager = require("../../clientManager");
+	.action(async function () {
+		const ClientManager = (await import("../../clientManager")).default;
 		const users = new ClientManager().getUsers();
 
 		if (users === undefined) {
@@ -32,3 +30,5 @@ program
 			log.info(`${i + 1}. ${colors.bold(user)}`);
 		});
 	});
+
+export default program;
diff --git a/src/command-line/users/remove.js b/server/command-line/users/remove.ts
similarity index 59%
rename from src/command-line/users/remove.js
rename to server/command-line/users/remove.ts
index 840b69a8..b7a7f4ac 100644
--- a/src/command-line/users/remove.js
+++ b/server/command-line/users/remove.ts
@@ -1,22 +1,22 @@
-"use strict";
-
-const log = require("../../log");
-const colors = require("chalk");
-const program = require("commander");
-const fs = require("fs");
-const Config = require("../../config");
-const Utils = require("../utils");
+import log from "../../log";
+import colors from "chalk";
+import {Command} from "commander";
+import fs from "fs";
+import Config from "../../config";
+import Utils from "../utils";
 
+const program = new Command("remove");
 program
-	.command("remove <name>")
 	.description("Remove an existing user")
 	.on("--help", Utils.extraHelp)
+	.argument("<name>", "name of the user")
 	.action(function (name) {
 		if (!fs.existsSync(Config.getUsersPath())) {
 			log.error(`${Config.getUsersPath()} does not exist.`);
 			return;
 		}
 
+		// eslint-disable-next-line @typescript-eslint/no-var-requires
 		const ClientManager = require("../../clientManager");
 		const manager = new ClientManager();
 
@@ -26,7 +26,9 @@ program
 			} else {
 				log.error(`User ${colors.bold(name)} does not exist.`);
 			}
-		} catch (e) {
+		} catch (e: any) {
 			// There was an error, already logged
 		}
 	});
+
+export default program;
diff --git a/src/command-line/users/reset.js b/server/command-line/users/reset.ts
similarity index 79%
rename from src/command-line/users/reset.js
rename to server/command-line/users/reset.ts
index 89a7f2f5..fc683e78 100644
--- a/src/command-line/users/reset.js
+++ b/server/command-line/users/reset.ts
@@ -1,17 +1,16 @@
-"use strict";
-
-const log = require("../../log");
-const colors = require("chalk");
-const program = require("commander");
-const fs = require("fs");
-const Helper = require("../../helper");
-const Config = require("../../config");
-const Utils = require("../utils");
+import log from "../../log";
+import colors from "chalk";
+import {Command} from "commander";
+import fs from "fs";
+import Helper from "../../helper";
+import Config from "../../config";
+import Utils from "../utils";
 
+const program = new Command("reset");
 program
-	.command("reset <name>")
 	.description("Reset user password")
 	.on("--help", Utils.extraHelp)
+	.argument("<name>", "name of the user")
 	.option("--password [password]", "new password, will be prompted if not specified")
 	.action(function (name, cmdObj) {
 		if (!fs.existsSync(Config.getUsersPath())) {
@@ -19,6 +18,7 @@ program
 			return;
 		}
 
+		// eslint-disable-next-line @typescript-eslint/no-var-requires
 		const ClientManager = require("../../clientManager");
 		const users = new ClientManager().getUsers();
 
@@ -71,3 +71,5 @@ function change(name, password) {
 
 	log.info(`Successfully reset password for ${colors.bold(name)}.`);
 }
+
+export default program;
diff --git a/src/command-line/utils.js b/server/command-line/utils.ts
similarity index 61%
rename from src/command-line/utils.js
rename to server/command-line/utils.ts
index c6cec2e3..835fda16 100644
--- a/src/command-line/utils.js
+++ b/server/command-line/utils.ts
@@ -1,17 +1,15 @@
-"use strict";
-
-const _ = require("lodash");
-const log = require("../log");
-const colors = require("chalk");
-const fs = require("fs");
-const Helper = require("../helper");
-const Config = require("../config");
-const path = require("path");
-
-let home;
+import _ from "lodash";
+import log from "../log";
+import colors from "chalk";
+import fs from "fs";
+import Helper from "../helper";
+import Config from "../config";
+import path from "path";
+import {spawn} from "child_process";
+let home: string;
 
 class Utils {
-	static extraHelp() {
+	static extraHelp(this: void) {
 		[
 			"",
 			"Environment variable:",
@@ -27,46 +25,60 @@ class Utils {
 			return home;
 		}
 
-		const distConfig = path.resolve(path.join(__dirname, "..", "..", ".thelounge_home"));
+		const distConfig = Utils.getFileFromRelativeToRoot(".thelounge_home");
 
 		home = fs.readFileSync(distConfig, "utf-8").trim();
 
 		return home;
 	}
 
+	static getFileFromRelativeToRoot(...fileName: string[]) {
+		// e.g. /thelounge/server/command-line/utils.ts
+		if (process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development") {
+			return path.resolve(path.join(__dirname, "..", "..", ...fileName));
+		}
+
+		// e.g. /thelounge/dist/server/command-line/utils.ts
+		return path.resolve(path.join(__dirname, "..", "..", "..", ...fileName));
+	}
+
 	// Parses CLI options such as `-c public=true`, `-c debug.raw=true`, etc.
-	static parseConfigOptions(val, memo) {
+	static parseConfigOptions(this: void, val: string, memo?: any) {
 		// Invalid option that is not of format `key=value`, do nothing
 		if (!val.includes("=")) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 			return memo;
 		}
 
-		const parseValue = (value) => {
-			if (value === "true") {
-				return true;
-			} else if (value === "false") {
-				return false;
-			} else if (value === "undefined") {
-				return undefined;
-			} else if (value === "null") {
-				return null;
-			} else if (/^-?[0-9]+$/.test(value)) {
-				// Numbers like port
-				value = parseInt(value, 10);
-			} else if (/^\[.*\]$/.test(value)) {
-				// Arrays
-				// Supporting arrays `[a,b]` and `[a, b]`
-				const array = value.slice(1, -1).split(/,\s*/);
+		const parseValue = (value: string) => {
+			switch (value) {
+				case "true":
+					return true;
+				case "false":
+					return false;
+				case "undefined":
+					return undefined;
+				case "null":
+					return null;
+				default:
+					if (/^-?[0-9]+$/.test(value)) {
+						// Numbers like port
+						return parseInt(value, 10);
+					} else if (/^\[.*\]$/.test(value)) {
+						// Arrays
+						// Supporting arrays `[a,b]` and `[a, b]`
+						const array = value.slice(1, -1).split(/,\s*/);
 
-				// If [] is given, it will be parsed as `[ "" ]`, so treat this as empty
-				if (array.length === 1 && array[0] === "") {
-					return [];
-				}
+						// If [] is given, it will be parsed as `[ "" ]`, so treat this as empty
+						if (array.length === 1 && array[0] === "") {
+							return [];
+						}
 
-				return array.map(parseValue); // Re-parses all values of the array
+						return array.map(parseValue) as Array<Record<string, string>>; // Re-parses all values of the array
+					}
+
+					return value;
 			}
-
-			return value;
 		};
 
 		// First time the option is parsed, memo is not set
@@ -87,10 +99,11 @@ class Utils {
 			memo = _.set(memo, key, parsedValue);
 		}
 
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 		return memo;
 	}
 
-	static executeYarnCommand(command, ...parameters) {
+	static executeYarnCommand(command: string, ...parameters: string[]) {
 		const yarn = require.resolve("yarn/bin/yarn.js");
 		const packagesPath = Config.getPackagesPath();
 		const cachePath = path.join(packagesPath, "package_manager_cache");
@@ -120,7 +133,7 @@ class Utils {
 
 		return new Promise((resolve, reject) => {
 			let success = false;
-			const add = require("child_process").spawn(
+			const add = spawn(
 				process.execPath,
 				[yarn, command, ...staticParameters, ...parameters],
 				{env: env}
@@ -137,7 +150,7 @@ class Utils {
 							if (line.type === "success") {
 								success = true;
 							}
-						} catch (e) {
+						} catch (e: any) {
 							// Stdout buffer has limitations and yarn may print
 							// big package trees, for example in the upgrade command
 							// See https://github.com/thelounge/thelounge/issues/3679
@@ -149,7 +162,7 @@ class Utils {
 				data.toString()
 					.trim()
 					.split("\n")
-					.forEach((line) => {
+					.forEach((line: string) => {
 						const json = JSON.parse(line);
 
 						if (json.type === "error") {
@@ -159,7 +172,7 @@ class Utils {
 			});
 
 			add.on("error", (e) => {
-				log.error(`${e}`);
+				log.error(`${e.message}:`, e.stack || "");
 				process.exit(1);
 			});
 
@@ -168,10 +181,10 @@ class Utils {
 					return reject(code);
 				}
 
-				resolve();
+				resolve(true);
 			});
 		});
 	}
 }
 
-module.exports = Utils;
+export default Utils;
diff --git a/src/config.js b/server/config.ts
similarity index 54%
rename from src/config.js
rename to server/config.ts
index e7860f8f..543a8135 100644
--- a/src/config.js
+++ b/server/config.ts
@@ -1,16 +1,116 @@
-"use strict";
+/* eslint-disable @typescript-eslint/no-var-requires */
+import path from "path";
+import fs, {Stats} from "fs";
+import os from "os";
+import _ from "lodash";
+import colors from "chalk";
 
-const path = require("path");
-const fs = require("fs");
-const os = require("os");
-const _ = require("lodash");
-const colors = require("chalk");
-const log = require("./log");
-const Helper = require("./helper");
+import log from "./log";
+import Helper from "./helper";
+import Utils from "./command-line/utils";
+import Network from "./models/network";
+
+// TODO: Type this
+export type WebIRC = {
+	[key: string]: any;
+};
+
+type Https = {
+	enable: boolean;
+	key: string;
+	certificate: string;
+	ca: string;
+};
+
+type FileUpload = {
+	enable: boolean;
+	maxFileSize: number;
+	baseUrl?: string;
+};
+
+export type Defaults = Pick<
+	Network,
+	| "name"
+	| "host"
+	| "port"
+	| "password"
+	| "tls"
+	| "rejectUnauthorized"
+	| "nick"
+	| "username"
+	| "realname"
+	| "leaveMessage"
+	| "sasl"
+	| "saslAccount"
+	| "saslPassword"
+> & {
+	join?: string;
+};
+
+type Identd = {
+	enable: boolean;
+	port: number;
+};
+
+type SearchDN = {
+	rootDN: string;
+	rootPassword: string;
+	filter: string;
+	base: string;
+	scope: string;
+};
+
+type Ldap = {
+	enable: boolean;
+	url: string;
+	tlsOptions: any;
+	primaryKey: string;
+	searchDN: SearchDN;
+	baseDN?: string;
+};
+
+type TlsOptions = any;
+
+type Debug = {
+	ircFramework: boolean;
+	raw: boolean;
+};
+
+export type ConfigType = {
+	public: boolean;
+	host: string | undefined;
+	port: number;
+	bind: string | undefined;
+	reverseProxy: boolean;
+	maxHistory: number;
+	https: Https;
+	theme: string;
+	prefetch: boolean;
+	disableMediaPreview: boolean;
+	prefetchStorage: boolean;
+	prefetchMaxImageSize: number;
+	prefetchMaxSearchSize: number;
+	prefetchTimeout: number;
+	fileUpload: FileUpload;
+	transports: string[];
+	leaveMessage: string;
+	defaults: Defaults;
+	lockNetwork: boolean;
+	messageStorage: string[];
+	useHexIp: boolean;
+	webirc?: WebIRC;
+	identd: Identd;
+	oidentd?: string;
+	ldap: Ldap;
+	debug: Debug;
+	themeColor: string;
+};
 
 class Config {
-	values = require(path.resolve(path.join(__dirname, "..", "defaults", "config.js")));
-	#homePath;
+	values = require(path.resolve(
+		path.join(__dirname, "..", "defaults", "config.js")
+	)) as ConfigType;
+	#homePath = "";
 
 	getHomePath() {
 		return this.#homePath;
@@ -36,7 +136,7 @@ class Config {
 		return path.join(this.#homePath, "users");
 	}
 
-	getUserConfigPath(name) {
+	getUserConfigPath(name: string) {
 		return path.join(this.getUsersPath(), `${name}.json`);
 	}
 
@@ -48,7 +148,7 @@ class Config {
 		return path.join(this.#homePath, "packages");
 	}
 
-	getPackageModulePath(packageName) {
+	getPackageModulePath(packageName: string) {
 		return path.join(this.getPackagesPath(), "node_modules", packageName);
 	}
 
@@ -57,14 +157,16 @@ class Config {
 			return "thelounge";
 		}
 
-		return this.values.defaults.nick.replace(/%/g, () => Math.floor(Math.random() * 10));
+		return this.values.defaults.nick.replace(/%/g, () =>
+			Math.floor(Math.random() * 10).toString()
+		);
 	}
 
-	merge(newConfig) {
+	merge(newConfig: ConfigType) {
 		this._merge_config_objects(this.values, newConfig);
 	}
 
-	_merge_config_objects(oldConfig, newConfig) {
+	_merge_config_objects(oldConfig: ConfigType, newConfig: ConfigType) {
 		// semi exposed function so that we can test it
 		// it mutates the oldConfig, but returns it as a convenience for testing
 
@@ -83,17 +185,19 @@ class Config {
 			) {
 				log.warn(`Incorrect type for "${colors.bold(key)}", please verify your config.`);
 
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 				return objValue;
 			}
 
 			// For arrays, simply override the value with user provided one.
 			if (_.isArray(objValue)) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 				return srcValue;
 			}
 		});
 	}
 
-	setHome(newPath) {
+	setHome(newPath: string) {
 		this.#homePath = Helper.expandHome(newPath);
 
 		// Reload config from new home location
@@ -122,16 +226,18 @@ class Config {
 		if (this.values.fileUpload.baseUrl) {
 			try {
 				new URL("test/file.png", this.values.fileUpload.baseUrl);
-			} catch (e) {
-				this.values.fileUpload.baseUrl = null;
+			} catch (e: any) {
+				this.values.fileUpload.baseUrl = undefined;
 
-				log.warn(`The ${colors.bold("fileUpload.baseUrl")} you specified is invalid: ${e}`);
+				log.warn(
+					`The ${colors.bold("fileUpload.baseUrl")} you specified is invalid: ${String(
+						e
+					)}`
+				);
 			}
 		}
 
-		const manifestPath = path.resolve(
-			path.join(__dirname, "..", "public", "thelounge.webmanifest")
-		);
+		const manifestPath = Utils.getFileFromRelativeToRoot("public", "thelounge.webmanifest");
 
 		// Check if manifest exists, if not, the app most likely was not built
 		if (!fs.existsSync(manifestPath)) {
@@ -149,7 +255,7 @@ class Config {
 
 		// log dir probably shouldn't be world accessible.
 		// Create it with the desired permission bits if it doesn't exist yet.
-		let logsStat = undefined;
+		let logsStat: Stats | undefined = undefined;
 
 		const userLogsPath = this.getUserLogsPath();
 
@@ -162,21 +268,21 @@ class Config {
 		if (!logsStat) {
 			try {
 				fs.mkdirSync(userLogsPath, {recursive: true, mode: 0o750});
-			} catch (e) {
+			} catch (e: any) {
 				log.error("Unable to create logs directory", e);
 			}
 		} else if (logsStat && logsStat.mode & 0o001) {
 			log.warn(
-				"contents of",
 				userLogsPath,
-				"can be accessed by any user, the log files may be exposed"
+				"is world readable.",
+				"The log files may be exposed. Please fix the permissions."
 			);
 
 			if (os.platform() !== "win32") {
-				log.warn(`run \`chmod o-x ${userLogsPath}\` to correct it`);
+				log.warn(`run \`chmod o-x "${userLogsPath}"\` to correct it.`);
 			}
 		}
 	}
 }
 
-module.exports = new Config();
+export default new Config();
diff --git a/src/helper.js b/server/helper.ts
similarity index 79%
rename from src/helper.js
rename to server/helper.ts
index 4777a10c..bee5120f 100644
--- a/src/helper.js
+++ b/server/helper.ts
@@ -1,13 +1,17 @@
-"use strict";
+import pkg from "../package.json";
+import _ from "lodash";
+import path from "path";
+import os from "os";
+import fs from "fs";
+import net from "net";
+import bcrypt from "bcryptjs";
+import crypto from "crypto";
 
-const pkg = require("../package.json");
-const _ = require("lodash");
-const path = require("path");
-const os = require("os");
-const fs = require("fs");
-const net = require("net");
-const bcrypt = require("bcryptjs");
-const crypto = require("crypto");
+export type Hostmask = {
+	nick: string;
+	ident: string;
+	hostname: string;
+};
 
 const Helper = {
 	expandHome,
@@ -27,7 +31,7 @@ const Helper = {
 	},
 };
 
-module.exports = Helper;
+export default Helper;
 
 function getVersion() {
 	const gitCommit = getGitCommit();
@@ -39,10 +43,10 @@ function getVersionNumber() {
 	return pkg.version;
 }
 
-let _gitCommit;
+let _gitCommit: string | null = null;
 
 function getGitCommit() {
-	if (_gitCommit !== undefined) {
+	if (_gitCommit) {
 		return _gitCommit;
 	}
 
@@ -52,6 +56,7 @@ function getGitCommit() {
 	}
 
 	try {
+		// eslint-disable-next-line @typescript-eslint/no-var-requires
 		_gitCommit = require("child_process")
 			.execSync(
 				"git rev-parse --short HEAD", // Returns hash of current commit
@@ -60,7 +65,7 @@ function getGitCommit() {
 			.toString()
 			.trim();
 		return _gitCommit;
-	} catch (e) {
+	} catch (e: any) {
 		// Not a git repository or git is not installed
 		_gitCommit = null;
 		return null;
@@ -73,7 +78,7 @@ function getVersionCacheBust() {
 	return hash.substring(0, 10);
 }
 
-function ip2hex(address) {
+function ip2hex(address: string) {
 	// no ipv6 support
 	if (!net.isIPv4(address)) {
 		return "00000000";
@@ -95,7 +100,7 @@ function ip2hex(address) {
 
 // Expand ~ into the current user home dir.
 // This does *not* support `~other_user/tmp` => `/home/other_user/tmp`.
-function expandHome(shortenedPath) {
+function expandHome(shortenedPath: string) {
 	if (!shortenedPath) {
 		return "";
 	}
@@ -104,23 +109,23 @@ function expandHome(shortenedPath) {
 	return path.resolve(shortenedPath.replace(/^~($|\/|\\)/, home + "$1"));
 }
 
-function passwordRequiresUpdate(password) {
+function passwordRequiresUpdate(password: string) {
 	return bcrypt.getRounds(password) !== 11;
 }
 
-function passwordHash(password) {
+function passwordHash(password: string) {
 	return bcrypt.hashSync(password, bcrypt.genSaltSync(11));
 }
 
-function passwordCompare(password, expected) {
+function passwordCompare(password: string, expected: string) {
 	return bcrypt.compare(password, expected);
 }
 
-function parseHostmask(hostmask) {
+function parseHostmask(hostmask: string): Hostmask {
 	let nick = "";
 	let ident = "*";
 	let hostname = "*";
-	let parts = [];
+	let parts: string[] = [];
 
 	// Parse hostname first, then parse the rest
 	parts = hostmask.split("@");
@@ -152,7 +157,7 @@ function parseHostmask(hostmask) {
 	return result;
 }
 
-function compareHostmask(a, b) {
+function compareHostmask(a: Hostmask, b: Hostmask) {
 	return (
 		compareWithWildcard(a.nick, b.nick) &&
 		compareWithWildcard(a.ident, b.ident) &&
@@ -160,7 +165,7 @@ function compareHostmask(a, b) {
 	);
 }
 
-function compareWithWildcard(a, b) {
+function compareWithWildcard(a: string, b: string) {
 	// we allow '*' and '?' wildcards in our comparison.
 	// this is mostly aligned with https://modern.ircdocs.horse/#wildcard-expressions
 	// but we do not support the escaping. The ABNF does not seem to be clear as to
diff --git a/src/identification.js b/server/identification.ts
similarity index 59%
rename from src/identification.js
rename to server/identification.ts
index 59ebc590..12a08028 100644
--- a/src/identification.js
+++ b/server/identification.ts
@@ -1,14 +1,20 @@
-"use strict";
-
-const log = require("./log");
-const fs = require("fs");
-const net = require("net");
-const colors = require("chalk");
-const Helper = require("./helper");
-const Config = require("./config");
+import log from "./log";
+import fs from "fs";
+import net, {Socket} from "net";
+import colors from "chalk";
+import Helper from "./helper";
+import Config from "./config";
 
+type Connection = {
+	socket: Socket;
+	user: string;
+};
 class Identification {
-	constructor(startedCallback) {
+	private connectionId: number;
+	private connections: Map<number, Connection>;
+	private oidentdFile?: string;
+
+	constructor(startedCallback: (identHandler: Identification, err?: Error) => void) {
 		this.connectionId = 0;
 		this.connections = new Map();
 
@@ -39,11 +45,16 @@ class Identification {
 				},
 				() => {
 					const address = server.address();
-					log.info(
-						`Identd server available on ${colors.green(
-							address.address + ":" + address.port
-						)}`
-					);
+
+					if (typeof address === "string") {
+						log.info(`Identd server available on ${colors.green(address)}`);
+					} else if (address?.address) {
+						log.info(
+							`Identd server available on ${colors.green(
+								address.address + ":" + address.port.toString()
+							)}`
+						);
+					}
 
 					startedCallback(this);
 				}
@@ -53,16 +64,16 @@ class Identification {
 		}
 	}
 
-	serverConnection(socket) {
-		socket.on("error", (err) => log.error(`Identd socket error: ${err}`));
+	serverConnection(socket: Socket) {
+		socket.on("error", (err: string) => log.error(`Identd socket error: ${err}`));
 		socket.on("data", (data) => {
 			this.respondToIdent(socket, data);
 			socket.end();
 		});
 	}
 
-	respondToIdent(socket, data) {
-		data = data.toString().split(",");
+	respondToIdent(socket: Socket, buffer: Buffer) {
+		const data = buffer.toString().split(",");
 
 		const lport = parseInt(data[0], 10) || 0;
 		const fport = parseInt(data[1], 10) || 0;
@@ -82,7 +93,7 @@ class Identification {
 		socket.write(`${lport}, ${fport} : ERROR : NO-USER\r\n`);
 	}
 
-	addSocket(socket, user) {
+	addSocket(socket: Socket, user: string) {
 		const id = ++this.connectionId;
 
 		this.connections.set(id, {socket, user});
@@ -94,7 +105,7 @@ class Identification {
 		return id;
 	}
 
-	removeSocket(id) {
+	removeSocket(id: number) {
 		this.connections.delete(id);
 
 		if (this.oidentdFile) {
@@ -106,18 +117,24 @@ class Identification {
 		let file = "# Warning: file generated by The Lounge: changes will be overwritten!\n";
 
 		this.connections.forEach((connection) => {
+			if (!connection.socket.remotePort || !connection.socket.localPort) {
+				throw new Error("Socket has no remote or local port");
+			}
+
 			file +=
 				`fport ${connection.socket.remotePort}` +
 				` lport ${connection.socket.localPort}` +
 				` { reply "${connection.user}" }\n`;
 		});
 
-		fs.writeFile(this.oidentdFile, file, {flag: "w+"}, function (err) {
-			if (err) {
-				log.error("Failed to update oidentd file!", err);
-			}
-		});
+		if (this.oidentdFile) {
+			fs.writeFile(this.oidentdFile, file, {flag: "w+"}, function (err) {
+				if (err) {
+					log.error("Failed to update oidentd file!", err.message);
+				}
+			});
+		}
 	}
 }
 
-module.exports = Identification;
+export default Identification;
diff --git a/server/index.d.ts b/server/index.d.ts
new file mode 100644
index 00000000..41dcf033
--- /dev/null
+++ b/server/index.d.ts
@@ -0,0 +1 @@
+import "./types";
diff --git a/server/index.ts b/server/index.ts
new file mode 100755
index 00000000..34dc56f8
--- /dev/null
+++ b/server/index.ts
@@ -0,0 +1,8 @@
+import * as dns from "dns";
+
+// Set DNS result order early before anything that may depend on it happens.
+if (dns.setDefaultResultOrder) {
+	dns.setDefaultResultOrder("verbatim");
+}
+
+import "./command-line";
diff --git a/src/log.js b/server/log.ts
similarity index 62%
rename from src/log.js
rename to server/log.ts
index eaf7f48e..cff64105 100644
--- a/src/log.js
+++ b/server/log.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const colors = require("chalk");
-const read = require("read");
+import colors from "chalk";
+import read from "read";
 
 function timestamp() {
 	const datetime = new Date().toISOString().split(".")[0].replace("T", " ");
@@ -9,27 +7,32 @@ function timestamp() {
 	return colors.dim(datetime);
 }
 
-module.exports = {
+const log = {
 	/* eslint-disable no-console */
-	error(...args) {
+	error(...args: string[]) {
 		console.error(timestamp(), colors.red("[ERROR]"), ...args);
 	},
-	warn(...args) {
+	warn(...args: string[]) {
 		console.error(timestamp(), colors.yellow("[WARN]"), ...args);
 	},
-	info(...args) {
+	info(...args: string[]) {
 		console.log(timestamp(), colors.blue("[INFO]"), ...args);
 	},
-	debug(...args) {
+	debug(...args: string[]) {
 		console.log(timestamp(), colors.green("[DEBUG]"), ...args);
 	},
-	raw(...args) {
+	raw(...args: string[]) {
 		console.log(...args);
 	},
 	/* eslint-enable no-console */
 
-	prompt(options, callback) {
+	prompt(
+		options: {prompt?: string; default?: string; text: string; silent?: boolean},
+		callback: (error, result, isDefault) => void
+	): void {
 		options.prompt = [timestamp(), colors.cyan("[PROMPT]"), options.text].join(" ");
 		read(options, callback);
 	},
 };
+
+export default log;
diff --git a/server/models/chan.ts b/server/models/chan.ts
new file mode 100644
index 00000000..e23955fa
--- /dev/null
+++ b/server/models/chan.ts
@@ -0,0 +1,336 @@
+import _ from "lodash";
+import log from "../log";
+import Config from "../config";
+import User from "./user";
+import Msg, {MessageType} from "./msg";
+import storage from "../plugins/storage";
+import Client from "../client";
+import Network from "./network";
+import Prefix from "./prefix";
+
+export enum ChanType {
+	CHANNEL = "channel",
+	LOBBY = "lobby",
+	QUERY = "query",
+	SPECIAL = "special",
+}
+
+export enum SpecialChanType {
+	BANLIST = "list_bans",
+	INVITELIST = "list_invites",
+	CHANNELLIST = "list_channels",
+	IGNORELIST = "list_ignored",
+}
+
+export enum ChanState {
+	PARTED = 0,
+	JOINED = 1,
+}
+
+// eslint-disable-next-line no-use-before-define
+export type FilteredChannel = Chan & {
+	users: [];
+	totalMessages: number;
+};
+
+class Chan {
+	// TODO: don't force existence, figure out how to make TS infer it.
+	id!: number;
+	messages!: Msg[];
+	name!: string;
+	key!: string;
+	topic!: string;
+	firstUnread!: number;
+	unread!: number;
+	highlight!: number;
+	users!: Map<string, User>;
+	muted!: boolean;
+	type!: ChanType;
+	state!: ChanState;
+
+	userAway?: boolean;
+	special?: SpecialChanType;
+	data?: any;
+	closed?: boolean;
+	num_users?: number;
+	static optionalProperties = ["userAway", "special", "data", "closed", "num_users"];
+
+	constructor(attr?: Partial<Chan>) {
+		_.defaults(this, attr, {
+			id: 0,
+			messages: [],
+			name: "",
+			key: "",
+			topic: "",
+			type: ChanType.CHANNEL,
+			state: ChanState.PARTED,
+			firstUnread: 0,
+			unread: 0,
+			highlight: 0,
+			users: new Map(),
+			muted: false,
+		});
+	}
+
+	destroy() {
+		this.dereferencePreviews(this.messages);
+	}
+
+	pushMessage(client: Client, msg: Msg, increasesUnread = false) {
+		const chan = this.id;
+		const obj = {chan, msg} as {
+			chan: number;
+			msg: Msg;
+			unread?: number;
+			highlight?: number;
+		};
+
+		msg.id = client.idMsg++;
+
+		// If this channel is open in any of the clients, do not increase unread counter
+		const isOpen = _.find(client.attachedClients, {openChannel: chan}) !== undefined;
+
+		if (msg.self) {
+			// reset counters/markers when receiving self-/echo-message
+			this.unread = 0;
+			this.firstUnread = msg.id;
+			this.highlight = 0;
+		} else if (!isOpen) {
+			if (!this.firstUnread) {
+				this.firstUnread = msg.id;
+			}
+
+			if (increasesUnread || msg.highlight) {
+				obj.unread = ++this.unread;
+			}
+
+			if (msg.highlight) {
+				obj.highlight = ++this.highlight;
+			}
+		}
+
+		client.emit("msg", obj);
+
+		// Never store messages in public mode as the session
+		// is completely destroyed when the page gets closed
+		if (Config.values.public) {
+			return;
+		}
+
+		// showInActive is only processed on "msg", don't need it on page reload
+		if (msg.showInActive) {
+			delete msg.showInActive;
+		}
+
+		this.writeUserLog(client, msg);
+
+		if (Config.values.maxHistory >= 0 && this.messages.length > Config.values.maxHistory) {
+			const deleted = this.messages.splice(
+				0,
+				this.messages.length - Config.values.maxHistory
+			);
+
+			// If maxHistory is 0, image would be dereferenced before client had a chance to retrieve it,
+			// so for now, just don't implement dereferencing for this edge case.
+			if (Config.values.maxHistory > 0) {
+				this.dereferencePreviews(deleted);
+			}
+		}
+	}
+	dereferencePreviews(messages) {
+		if (!Config.values.prefetch || !Config.values.prefetchStorage) {
+			return;
+		}
+
+		messages.forEach((message) => {
+			if (message.previews) {
+				message.previews.forEach((preview) => {
+					if (preview.thumb) {
+						storage.dereference(preview.thumb);
+						preview.thumb = "";
+					}
+				});
+			}
+		});
+	}
+	getSortedUsers(irc?: Network["irc"]) {
+		const users = Array.from(this.users.values());
+
+		if (!irc || !irc.network || !irc.network.options || !irc.network.options.PREFIX) {
+			return users;
+		}
+
+		const userModeSortPriority = {};
+		irc.network.options.PREFIX.forEach((prefix, index) => {
+			userModeSortPriority[prefix.symbol] = index;
+		});
+
+		userModeSortPriority[""] = 99; // No mode is lowest
+
+		return users.sort(function (a, b) {
+			if (a.mode === b.mode) {
+				return a.nick.toLowerCase() < b.nick.toLowerCase() ? -1 : 1;
+			}
+
+			return userModeSortPriority[a.mode] - userModeSortPriority[b.mode];
+		});
+	}
+	findMessage(msgId: number) {
+		return this.messages.find((message) => message.id === msgId);
+	}
+	findUser(nick: string) {
+		return this.users.get(nick.toLowerCase());
+	}
+	getUser(nick: string) {
+		return this.findUser(nick) || new User({nick}, new Prefix([]));
+	}
+	setUser(user: User) {
+		this.users.set(user.nick.toLowerCase(), user);
+	}
+	removeUser(user: User) {
+		this.users.delete(user.nick.toLowerCase());
+	}
+	/**
+	 * Get a clean clone of this channel that will be sent to the client.
+	 * This function performs manual cloning of channel object for
+	 * better control of performance and memory usage.
+	 *
+	 * @param {(int|bool)} lastActiveChannel - Last known active user channel id (needed to control how many messages are sent)
+	 *                                         If true, channel is assumed active.
+	 * @param {int} lastMessage - Last message id seen by active client to avoid sending duplicates.
+	 */
+	getFilteredClone(lastActiveChannel?: number | boolean, lastMessage?: number): FilteredChannel {
+		return Object.keys(this).reduce((newChannel, prop) => {
+			if (Chan.optionalProperties.includes(prop)) {
+				if (this[prop] !== undefined || (Array.isArray(this[prop]) && this[prop].length)) {
+					newChannel[prop] = this[prop];
+				}
+			} else if (prop === "users") {
+				// Do not send users, client requests updated user list whenever needed
+				newChannel[prop] = [];
+			} else if (prop === "messages") {
+				// If client is reconnecting, only send new messages that client has not seen yet
+				if (lastMessage && lastMessage > -1) {
+					// When reconnecting, always send up to 100 messages to prevent message gaps on the client
+					// See https://github.com/thelounge/thelounge/issues/1883
+					newChannel[prop] = this[prop].filter((m) => m.id > lastMessage).slice(-100);
+				} else {
+					// If channel is active, send up to 100 last messages, for all others send just 1
+					// Client will automatically load more messages whenever needed based on last seen messages
+					const messagesToSend =
+						lastActiveChannel === true || this.id === lastActiveChannel ? 100 : 1;
+
+					newChannel[prop] = this[prop].slice(-messagesToSend);
+				}
+
+				(newChannel as FilteredChannel).totalMessages = this[prop].length;
+			} else {
+				newChannel[prop] = this[prop];
+			}
+
+			return newChannel;
+		}, {}) as FilteredChannel;
+	}
+	writeUserLog(client: Client, msg: Msg) {
+		this.messages.push(msg);
+
+		// Are there any logs enabled
+		if (client.messageStorage.length === 0) {
+			return;
+		}
+
+		const targetChannel: Chan = this;
+
+		// Is this particular message or channel loggable
+		if (!msg.isLoggable() || !this.isLoggable()) {
+			// Because notices are nasty and can be shown in active channel on the client
+			// if there is no open query, we want to always log notices in the sender's name
+			if (msg.type === MessageType.NOTICE && msg.showInActive) {
+				targetChannel.name = msg.from.nick || ""; // TODO: check if || works
+			} else {
+				return;
+			}
+		}
+
+		// Find the parent network where this channel is in
+		const target = client.find(this.id);
+
+		if (!target) {
+			return;
+		}
+
+		for (const messageStorage of client.messageStorage) {
+			messageStorage.index(target.network, targetChannel, msg);
+		}
+	}
+	loadMessages(client: Client, network: Network) {
+		if (!this.isLoggable()) {
+			return;
+		}
+
+		if (!network.irc) {
+			// Network created, but misconfigured
+			log.warn(
+				`Failed to load messages for ${client.name}, network ${network.name} is not initialized.`
+			);
+			return;
+		}
+
+		if (!client.messageProvider) {
+			if (network.irc.network.cap.isEnabled("znc.in/playback")) {
+				// if we do have a message provider we might be able to only fetch partial history,
+				// so delay the cap in this case.
+				requestZncPlayback(this, network, 0);
+			}
+
+			return;
+		}
+
+		client.messageProvider
+			.getMessages(network, this)
+			.then((messages) => {
+				if (messages.length === 0) {
+					if (network.irc!.network.cap.isEnabled("znc.in/playback")) {
+						requestZncPlayback(this, network, 0);
+					}
+
+					return;
+				}
+
+				this.messages.unshift(...messages);
+
+				if (!this.firstUnread) {
+					this.firstUnread = messages[messages.length - 1].id;
+				}
+
+				client.emit("more", {
+					chan: this.id,
+					messages: messages.slice(-100),
+					totalMessages: messages.length,
+				});
+
+				if (network.irc!.network.cap.isEnabled("znc.in/playback")) {
+					const from = Math.floor(messages[messages.length - 1].time.getTime() / 1000);
+
+					requestZncPlayback(this, network, from);
+				}
+			})
+			.catch((err: Error) =>
+				log.error(`Failed to load messages for ${client.name}: ${err.toString()}`)
+			);
+	}
+	isLoggable() {
+		return this.type === ChanType.CHANNEL || this.type === ChanType.QUERY;
+	}
+	setMuteStatus(muted: boolean) {
+		this.muted = !!muted;
+	}
+}
+
+function requestZncPlayback(channel, network, from) {
+	network.irc.raw("ZNC", "*playback", "PLAY", channel.name, from.toString());
+}
+
+export default Chan;
+
+export type Channel = Chan;
diff --git a/server/models/msg.ts b/server/models/msg.ts
new file mode 100644
index 00000000..6a1d027c
--- /dev/null
+++ b/server/models/msg.ts
@@ -0,0 +1,134 @@
+import _ from "lodash";
+import {LinkPreview} from "../plugins/irc-events/link";
+import User from "./user";
+
+export type UserInMessage = Partial<User> & {
+	mode: string;
+};
+
+export enum MessageType {
+	UNHANDLED = "unhandled",
+	ACTION = "action",
+	AWAY = "away",
+	BACK = "back",
+	ERROR = "error",
+	INVITE = "invite",
+	JOIN = "join",
+	KICK = "kick",
+	LOGIN = "login",
+	LOGOUT = "logout",
+	MESSAGE = "message",
+	MODE = "mode",
+	MODE_CHANNEL = "mode_channel",
+	MODE_USER = "mode_user", // RPL_UMODEIS
+	MONOSPACE_BLOCK = "monospace_block",
+	NICK = "nick",
+	NOTICE = "notice",
+	PART = "part",
+	QUIT = "quit",
+	CTCP = "ctcp",
+	CTCP_REQUEST = "ctcp_request",
+	CHGHOST = "chghost",
+	TOPIC = "topic",
+	TOPIC_SET_BY = "topic_set_by",
+	WHOIS = "whois",
+	RAW = "raw",
+	PLUGIN = "plugin",
+	WALLOPS = "wallops",
+}
+
+class Msg {
+	from!: UserInMessage;
+	id!: number;
+	previews!: LinkPreview[];
+	text!: string;
+	type!: MessageType;
+	self!: boolean;
+	time!: Date;
+	hostmask!: string;
+	target!: UserInMessage;
+	// TODO: new_nick is only on MessageType.NICK,
+	// we should probably make Msgs that extend this class and use those
+	// throughout. I'll leave any similar fields below.
+	new_nick!: string;
+	highlight?: boolean;
+	showInActive?: boolean;
+	new_ident!: string;
+	new_host!: string;
+	ctcpMessage!: string;
+	command!: string;
+	invitedYou!: boolean;
+	gecos!: string;
+	account!: boolean;
+
+	// these are all just for error:
+	error!: string;
+	nick!: string;
+	channel!: string;
+	reason!: string;
+
+	raw_modes!: any;
+	when!: Date;
+	whois!: any;
+	users!: UserInMessage[] | string[];
+	statusmsgGroup!: string;
+	params!: string[];
+
+	constructor(attr?: Partial<Msg>) {
+		// Some properties need to be copied in the Msg object instead of referenced
+		if (attr) {
+			["from", "target"].forEach((prop) => {
+				if (attr[prop]) {
+					this[prop] = {
+						mode: attr[prop].mode,
+						nick: attr[prop].nick,
+					};
+				}
+			});
+		}
+
+		_.defaults(this, attr, {
+			from: {},
+			id: 0,
+			previews: [],
+			text: "",
+			type: MessageType.MESSAGE,
+			self: false,
+		});
+
+		if (this.time) {
+			this.time = new Date(this.time);
+		} else {
+			this.time = new Date();
+		}
+	}
+
+	findPreview(link: string) {
+		return this.previews.find((preview) => preview.link === link);
+	}
+
+	isLoggable() {
+		if (this.type === MessageType.TOPIC) {
+			// Do not log topic that is sent on channel join
+			return !!this.from.nick;
+		}
+
+		switch (this.type) {
+			case MessageType.MONOSPACE_BLOCK:
+			case MessageType.ERROR:
+			case MessageType.TOPIC_SET_BY:
+			case MessageType.MODE_CHANNEL:
+			case MessageType.MODE_USER:
+			case MessageType.RAW:
+			case MessageType.WHOIS:
+			case MessageType.PLUGIN:
+				return false;
+			default:
+				return true;
+		}
+	}
+}
+
+export default Msg;
+
+export type Message = Msg;
diff --git a/server/models/network.ts b/server/models/network.ts
new file mode 100644
index 00000000..bfb080b9
--- /dev/null
+++ b/server/models/network.ts
@@ -0,0 +1,653 @@
+import _ from "lodash";
+import {v4 as uuidv4} from "uuid";
+import IrcFramework, {Client as IRCClient} from "irc-framework";
+import Chan, {Channel, ChanType} from "./chan";
+import Msg, {MessageType} from "./msg";
+import Prefix from "./prefix";
+import Helper, {Hostmask} from "../helper";
+import Config, {WebIRC} from "../config";
+import STSPolicies from "../plugins/sts";
+import ClientCertificate, {ClientCertificateType} from "../plugins/clientCertificate";
+import Client from "../client";
+
+/**
+ * List of keys which should be sent to the client by default.
+ */
+const fieldsForClient = {
+	uuid: true,
+	name: true,
+	nick: true,
+	serverOptions: true,
+};
+
+type NetworkIrcOptions = {
+	host: string;
+	port: number;
+	password: string;
+	nick: string;
+	username: string;
+	gecos: string;
+	tls: boolean;
+	rejectUnauthorized: boolean;
+	webirc: WebIRC | null;
+	client_certificate: ClientCertificateType | null;
+	socks?: {
+		host: string;
+		port: number;
+		user: string;
+		pass: string;
+	};
+	sasl_mechanism?: string;
+	account?:
+		| {
+				account: string;
+				password: string;
+		  }
+		| Record<string, never>;
+};
+
+type NetworkStatus = {
+	connected: boolean;
+	secure: boolean;
+};
+
+export type IgnoreListItem = Hostmask & {
+	when?: number;
+};
+
+type IgnoreList = IgnoreListItem[];
+
+type NonNullableIRCWithOptions = NonNullable<IRCClient & {options: NetworkIrcOptions}>;
+
+// eslint-disable-next-line no-use-before-define
+export type NetworkWithIrcFramework = Network & {
+	// eslint-disable-next-line no-use-before-define
+	irc: NonNullable<Network["irc"]> & {
+		options: NonNullableIRCWithOptions;
+	};
+};
+
+class Network {
+	nick!: string;
+	name!: string;
+	host!: string;
+	port!: number;
+	tls!: boolean;
+	userDisconnected!: boolean;
+	rejectUnauthorized!: boolean;
+	password!: string;
+	awayMessage!: string;
+	commands!: any[];
+	username!: string;
+	realname!: string;
+	leaveMessage!: string;
+	sasl!: string;
+	saslAccount!: string;
+	saslPassword!: string;
+	channels!: Chan[];
+	uuid!: string;
+	proxyHost!: string;
+	proxyPort!: number;
+	proxyUsername!: string;
+	proxyPassword!: string;
+	proxyEnabled!: boolean;
+	highlightRegex?: RegExp;
+
+	irc?: IrcFramework.Client & {
+		options?: NetworkIrcOptions;
+	};
+
+	chanCache!: Chan[];
+	ignoreList!: IgnoreList;
+	keepNick!: string | null;
+
+	status!: NetworkStatus;
+
+	serverOptions!: {
+		CHANTYPES: string[];
+		PREFIX: Prefix;
+		NETWORK: string;
+	};
+
+	// TODO: this is only available on export
+	hasSTSPolicy!: boolean;
+
+	constructor(attr?: Partial<Network>) {
+		_.defaults(this, attr, {
+			name: "",
+			nick: "",
+			host: "",
+			port: 6667,
+			tls: false,
+			userDisconnected: false,
+			rejectUnauthorized: false,
+			password: "",
+			awayMessage: "",
+			commands: [],
+			username: "",
+			realname: "",
+			leaveMessage: "",
+			sasl: "",
+			saslAccount: "",
+			saslPassword: "",
+			channels: [],
+			irc: null,
+			serverOptions: {
+				CHANTYPES: ["#", "&"],
+				PREFIX: new Prefix([
+					{symbol: "!", mode: "Y"},
+					{symbol: "@", mode: "o"},
+					{symbol: "%", mode: "h"},
+					{symbol: "+", mode: "v"},
+				]),
+				NETWORK: "",
+			},
+
+			proxyHost: "",
+			proxyPort: 1080,
+			proxyUsername: "",
+			proxyPassword: "",
+			proxyEnabled: false,
+
+			chanCache: [],
+			ignoreList: [],
+			keepNick: null,
+		});
+
+		if (!this.uuid) {
+			this.uuid = uuidv4();
+		}
+
+		if (!this.name) {
+			this.name = this.host;
+		}
+
+		this.channels.unshift(
+			new Chan({
+				name: this.name,
+				type: ChanType.LOBBY,
+				// The lobby only starts as muted if every channel (unless it's special) is muted.
+				// This is A) easier to implement and B) stops some confusion on startup.
+				muted:
+					this.channels.length >= 1 &&
+					this.channels.every((chan) => chan.muted || chan.type === ChanType.SPECIAL),
+			})
+		);
+	}
+
+	validate(this: Network, client: Client) {
+		// Remove !, :, @ and whitespace characters from nicknames and usernames
+		const cleanNick = (str: string) => str.replace(/[\x00\s:!@]/g, "_").substring(0, 100);
+
+		// Remove new lines and limit length
+		const cleanString = (str: string) => str.replace(/[\x00\r\n]/g, "").substring(0, 300);
+
+		this.setNick(cleanNick(String(this.nick || Config.getDefaultNick())));
+
+		if (!this.username) {
+			// If username is empty, make one from the provided nick
+			this.username = this.nick.replace(/[^a-zA-Z0-9]/g, "");
+		}
+
+		this.username = cleanString(this.username) || "thelounge";
+		this.realname = cleanString(this.realname) || "The Lounge User";
+		this.leaveMessage = cleanString(this.leaveMessage);
+		this.password = cleanString(this.password);
+		this.host = cleanString(this.host).toLowerCase();
+		this.name = cleanString(this.name);
+		this.saslAccount = cleanString(this.saslAccount);
+		this.saslPassword = cleanString(this.saslPassword);
+
+		this.proxyHost = cleanString(this.proxyHost);
+		this.proxyPort = this.proxyPort || 1080;
+		this.proxyUsername = cleanString(this.proxyUsername);
+		this.proxyPassword = cleanString(this.proxyPassword);
+		this.proxyEnabled = !!this.proxyEnabled;
+
+		const error = function (network: Network, text: string) {
+			network.channels[0].pushMessage(
+				client,
+				new Msg({
+					type: MessageType.ERROR,
+					text: text,
+				}),
+				true
+			);
+		};
+
+		if (!this.port) {
+			this.port = this.tls ? 6697 : 6667;
+		}
+
+		if (!["", "plain", "external"].includes(this.sasl)) {
+			this.sasl = "";
+		}
+
+		if (Config.values.lockNetwork) {
+			// This check is needed to prevent invalid user configurations
+			if (
+				!Config.values.public &&
+				this.host &&
+				this.host.length > 0 &&
+				this.host !== Config.values.defaults.host
+			) {
+				error(this, `The hostname you specified (${this.host}) is not allowed.`);
+				return false;
+			}
+
+			if (Config.values.public) {
+				this.name = Config.values.defaults.name;
+				// Sync lobby channel name
+				this.channels[0].name = Config.values.defaults.name;
+			}
+
+			this.host = Config.values.defaults.host;
+			this.port = Config.values.defaults.port;
+			this.tls = Config.values.defaults.tls;
+			this.rejectUnauthorized = Config.values.defaults.rejectUnauthorized;
+		}
+
+		if (this.host.length === 0) {
+			error(this, "You must specify a hostname to connect.");
+			return false;
+		}
+
+		const stsPolicy = STSPolicies.get(this.host);
+
+		if (stsPolicy && !this.tls) {
+			error(
+				this,
+				`${this.host} has an active strict transport security policy, will connect to port ${stsPolicy.port} over a secure connection.`
+			);
+
+			this.port = stsPolicy.port;
+			this.tls = true;
+			this.rejectUnauthorized = true;
+		}
+
+		return true;
+	}
+
+	createIrcFramework(this: NetworkWithIrcFramework, client: Client) {
+		this.irc = new IrcFramework.Client({
+			version: false, // We handle it ourselves
+			outgoing_addr: Config.values.bind,
+			enable_chghost: true,
+			enable_echomessage: true,
+			enable_setname: true,
+			auto_reconnect: true,
+
+			// Exponential backoff maxes out at 300 seconds after 9 reconnects,
+			// it will keep trying for well over an hour (plus the timeouts)
+			auto_reconnect_max_retries: 30,
+
+			// TODO: this type should be set after setIrcFrameworkOptions
+		}) as NetworkWithIrcFramework["irc"];
+
+		this.setIrcFrameworkOptions(client);
+
+		this.irc.requestCap([
+			"znc.in/self-message", // Legacy echo-message for ZNC
+			"znc.in/playback", // See http://wiki.znc.in/Playback
+		]);
+	}
+
+	setIrcFrameworkOptions(this: NetworkWithIrcFramework, client: Client) {
+		this.irc.options.host = this.host;
+		this.irc.options.port = this.port;
+		this.irc.options.password = this.password;
+		this.irc.options.nick = this.nick;
+		this.irc.options.username = Config.values.useHexIp
+			? Helper.ip2hex(client.config.browser!.ip!)
+			: this.username;
+		this.irc.options.gecos = this.realname;
+		this.irc.options.tls = this.tls;
+		this.irc.options.rejectUnauthorized = this.rejectUnauthorized;
+		this.irc.options.webirc = this.createWebIrc(client);
+		this.irc.options.client_certificate = null;
+
+		if (this.proxyEnabled) {
+			this.irc.options.socks = {
+				host: this.proxyHost,
+				port: this.proxyPort,
+				user: this.proxyUsername,
+				pass: this.proxyPassword,
+			};
+		} else {
+			delete this.irc.options.socks;
+		}
+
+		if (!this.sasl) {
+			delete this.irc.options.sasl_mechanism;
+			delete this.irc.options.account;
+		} else if (this.sasl === "external") {
+			this.irc.options.sasl_mechanism = "EXTERNAL";
+			this.irc.options.account = {};
+			this.irc.options.client_certificate = ClientCertificate.get(this.uuid);
+		} else if (this.sasl === "plain") {
+			delete this.irc.options.sasl_mechanism;
+			this.irc.options.account = {
+				account: this.saslAccount,
+				password: this.saslPassword,
+			};
+		}
+	}
+
+	createWebIrc(client: Client) {
+		if (
+			!Config.values.webirc ||
+			!Object.prototype.hasOwnProperty.call(Config.values.webirc, this.host)
+		) {
+			return null;
+		}
+
+		const webircObject = {
+			password: Config.values.webirc[this.host],
+			username: "thelounge",
+			address: client.config.browser?.ip,
+			hostname: client.config.browser?.hostname,
+			options: {},
+		};
+
+		// https://ircv3.net/specs/extensions/webirc#options
+		if (client.config.browser?.isSecure) {
+			webircObject.options = {
+				secure: true,
+			};
+		}
+
+		if (typeof Config.values.webirc[this.host] === "function") {
+			webircObject.password = null;
+
+			return Config.values.webirc[this.host](webircObject, this) as typeof webircObject;
+		}
+
+		return webircObject;
+	}
+
+	edit(this: NetworkWithIrcFramework, client: Client, args: any) {
+		const oldNetworkName = this.name;
+		const oldNick = this.nick;
+		const oldRealname = this.realname;
+
+		this.keepNick = null;
+		this.nick = args.nick;
+		this.host = String(args.host || "");
+		this.name = String(args.name || "") || this.host;
+		this.port = parseInt(args.port, 10);
+		this.tls = !!args.tls;
+		this.rejectUnauthorized = !!args.rejectUnauthorized;
+		this.password = String(args.password || "");
+		this.username = String(args.username || "");
+		this.realname = String(args.realname || "");
+		this.leaveMessage = String(args.leaveMessage || "");
+		this.sasl = String(args.sasl || "");
+		this.saslAccount = String(args.saslAccount || "");
+		this.saslPassword = String(args.saslPassword || "");
+
+		this.proxyHost = String(args.proxyHost || "");
+		this.proxyPort = parseInt(args.proxyPort, 10);
+		this.proxyUsername = String(args.proxyUsername || "");
+		this.proxyPassword = String(args.proxyPassword || "");
+		this.proxyEnabled = !!args.proxyEnabled;
+
+		// Split commands into an array
+		this.commands = String(args.commands || "")
+			.replace(/\r\n|\r|\n/g, "\n")
+			.split("\n")
+			.filter((command) => command.length > 0);
+
+		// Sync lobby channel name
+		this.channels[0].name = this.name;
+
+		if (this.name !== oldNetworkName) {
+			// Send updated network name to all connected clients
+			client.emit("network:name", {
+				uuid: this.uuid,
+				name: this.name,
+			});
+		}
+
+		if (!this.validate(client)) {
+			return;
+		}
+
+		if (this.irc) {
+			const connected = this.irc.connection && this.irc.connection.connected;
+
+			if (this.nick !== oldNick) {
+				if (connected) {
+					// Send new nick straight away
+					this.irc.changeNick(this.nick);
+				} else {
+					this.irc.user.nick = this.nick;
+
+					// Update UI nick straight away if IRC is not connected
+					client.emit("nick", {
+						network: this.uuid,
+						nick: this.nick,
+					});
+				}
+			}
+
+			if (
+				connected &&
+				this.realname !== oldRealname &&
+				this.irc.network.cap.isEnabled("setname")
+			) {
+				this.irc.raw("SETNAME", this.realname);
+			}
+
+			this.setIrcFrameworkOptions(client);
+
+			if (this.irc.options?.username) {
+				this.irc.user.username = this.irc.options.username;
+			}
+
+			if (this.irc.options?.gecos) {
+				this.irc.user.gecos = this.irc.options.gecos;
+			}
+		}
+
+		client.save();
+	}
+
+	destroy() {
+		this.channels.forEach((channel) => channel.destroy());
+	}
+
+	setNick(this: Network, nick: string) {
+		this.nick = nick;
+		this.highlightRegex = new RegExp(
+			// Do not match characters and numbers (unless IRC color)
+			"(?:^|[^a-z0-9]|\x03[0-9]{1,2})" +
+				// Escape nickname, as it may contain regex stuff
+				_.escapeRegExp(nick) +
+				// Do not match characters and numbers
+				"(?:[^a-z0-9]|$)",
+
+			// Case insensitive search
+			"i"
+		);
+
+		if (this.keepNick === nick) {
+			this.keepNick = null;
+		}
+
+		if (this.irc?.options) {
+			this.irc.options.nick = nick;
+		}
+	}
+
+	getFilteredClone(lastActiveChannel?: number, lastMessage?: number) {
+		const filteredNetwork = Object.keys(this).reduce((newNetwork, prop) => {
+			if (prop === "channels") {
+				// Channels objects perform their own cloning
+				newNetwork[prop] = this[prop].map((channel) =>
+					channel.getFilteredClone(lastActiveChannel, lastMessage)
+				);
+			} else if (fieldsForClient[prop]) {
+				// Some properties that are not useful for the client are skipped
+				newNetwork[prop] = this[prop];
+			}
+
+			return newNetwork;
+		}, {}) as Network;
+
+		filteredNetwork.status = this.getNetworkStatus();
+
+		return filteredNetwork;
+	}
+
+	getNetworkStatus() {
+		const status = {
+			connected: false,
+			secure: false,
+		};
+
+		if (this.irc && this.irc.connection && this.irc.connection.transport) {
+			const transport = this.irc.connection.transport;
+
+			if (transport.socket) {
+				const isLocalhost = transport.socket.remoteAddress === "127.0.0.1";
+				const isAuthorized = transport.socket.encrypted && transport.socket.authorized;
+
+				status.connected = transport.isConnected();
+				status.secure = isAuthorized || isLocalhost;
+			}
+		}
+
+		return status;
+	}
+
+	addChannel(newChan: Chan) {
+		let index = this.channels.length; // Default to putting as the last item in the array
+
+		// Don't sort special channels in amongst channels/users.
+		if (newChan.type === ChanType.CHANNEL || newChan.type === ChanType.QUERY) {
+			// We start at 1 so we don't test against the lobby
+			for (let i = 1; i < this.channels.length; i++) {
+				const compareChan = this.channels[i];
+
+				// Negative if the new chan is alphabetically before the next chan in the list, positive if after
+				if (
+					newChan.name.localeCompare(compareChan.name, undefined, {
+						sensitivity: "base",
+					}) <= 0 ||
+					(compareChan.type !== ChanType.CHANNEL && compareChan.type !== ChanType.QUERY)
+				) {
+					index = i;
+					break;
+				}
+			}
+		}
+
+		this.channels.splice(index, 0, newChan);
+		return index;
+	}
+
+	quit(quitMessage?: string) {
+		if (!this.irc) {
+			return;
+		}
+
+		// https://ircv3.net/specs/extensions/sts#rescheduling-expiry-on-disconnect
+		STSPolicies.refreshExpiration(this.host);
+
+		this.irc.quit(quitMessage || this.leaveMessage || Config.values.leaveMessage);
+	}
+
+	exportForEdit() {
+		const fieldsToReturn = [
+			"uuid",
+			"name",
+			"nick",
+			"password",
+			"username",
+			"realname",
+			"leaveMessage",
+			"sasl",
+			"saslAccount",
+			"saslPassword",
+			"commands",
+
+			"proxyEnabled",
+			"proxyHost",
+			"proxyPort",
+			"proxyUsername",
+			"proxyPassword",
+		];
+
+		if (!Config.values.lockNetwork) {
+			fieldsToReturn.push("host");
+			fieldsToReturn.push("port");
+			fieldsToReturn.push("tls");
+			fieldsToReturn.push("rejectUnauthorized");
+		}
+
+		const data = _.pick(this, fieldsToReturn) as Network;
+
+		data.hasSTSPolicy = !!STSPolicies.get(this.host);
+
+		return data;
+	}
+
+	export() {
+		const network = _.pick(this, [
+			"uuid",
+			"awayMessage",
+			"nick",
+			"name",
+			"host",
+			"port",
+			"tls",
+			"userDisconnected",
+			"rejectUnauthorized",
+			"password",
+			"username",
+			"realname",
+			"leaveMessage",
+			"sasl",
+			"saslAccount",
+			"saslPassword",
+			"commands",
+			"ignoreList",
+
+			"proxyHost",
+			"proxyPort",
+			"proxyUsername",
+			"proxyEnabled",
+			"proxyPassword",
+		]) as Network;
+
+		network.channels = this.channels
+			.filter(function (channel) {
+				return channel.type === ChanType.CHANNEL || channel.type === ChanType.QUERY;
+			})
+			.map(function (chan) {
+				const keys = ["name", "muted"];
+
+				if (chan.type === ChanType.CHANNEL) {
+					keys.push("key");
+				} else if (chan.type === ChanType.QUERY) {
+					keys.push("type");
+				}
+
+				return _.pick(chan, keys);
+				// Override the type because we're omitting ID
+			}) as Channel[];
+
+		return network;
+	}
+
+	getChannel(name: string) {
+		name = name.toLowerCase();
+
+		return _.find(this.channels, function (that, i) {
+			// Skip network lobby (it's always unshifted into first position)
+			return i > 0 && that.name.toLowerCase() === name;
+		});
+	}
+}
+
+export default Network;
diff --git a/src/models/prefix.js b/server/models/prefix.ts
similarity index 58%
rename from src/models/prefix.js
rename to server/models/prefix.ts
index 331efdff..85445d26 100644
--- a/src/models/prefix.js
+++ b/server/models/prefix.ts
@@ -1,7 +1,16 @@
-"use strict";
+type PrefixSymbol = string;
+
+type PrefixObject = {
+	symbol: PrefixSymbol;
+	mode: string;
+};
 
 class Prefix {
-	constructor(prefix) {
+	prefix: PrefixObject[];
+	modeToSymbol: {[mode: string]: string};
+	symbols: string[];
+
+	constructor(prefix: PrefixObject[]) {
 		this.prefix = prefix || []; // [{symbol: "@", mode: "o"}, ... ]
 		this.modeToSymbol = {};
 		this.symbols = [];
@@ -20,14 +29,14 @@ class Prefix {
 		});
 	}
 
-	update(prefix) {
+	update(prefix: PrefixObject[]) {
 		this.prefix = prefix || [];
 		this._update_internals();
 	}
 
-	forEach(f) {
+	forEach(f: (value: PrefixObject, index: number, array: PrefixObject[]) => void) {
 		return this.prefix.forEach(f);
 	}
 }
 
-module.exports = Prefix;
+export default Prefix;
diff --git a/server/models/user.ts b/server/models/user.ts
new file mode 100644
index 00000000..ea2d39b0
--- /dev/null
+++ b/server/models/user.ts
@@ -0,0 +1,44 @@
+import _ from "lodash";
+import Prefix from "./prefix";
+
+class User {
+	modes!: string[];
+	// Users in the channel have only one mode assigned
+	mode!: string;
+	away!: string;
+	nick!: string;
+	lastMessage!: number;
+
+	constructor(attr: Partial<User>, prefix?: Prefix) {
+		_.defaults(this, attr, {
+			modes: [],
+			away: "",
+			nick: "",
+			lastMessage: 0,
+		});
+
+		Object.defineProperty(this, "mode", {
+			get() {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+				return this.modes[0] || "";
+			},
+		});
+
+		this.setModes(this.modes, prefix || new Prefix([]));
+	}
+
+	setModes(modes: string[], prefix: Prefix) {
+		// irc-framework sets character mode, but The Lounge works with symbols
+		this.modes = modes.map((mode) => prefix.modeToSymbol[mode]);
+	}
+
+	toJSON() {
+		return {
+			nick: this.nick,
+			modes: this.modes,
+			lastMessage: this.lastMessage,
+		};
+	}
+}
+
+export default User;
diff --git a/server/plugins/auth.ts b/server/plugins/auth.ts
new file mode 100644
index 00000000..f30b0e22
--- /dev/null
+++ b/server/plugins/auth.ts
@@ -0,0 +1,67 @@
+import colors from "chalk";
+import Client from "../client";
+import ClientManager from "../clientManager";
+import log from "../log";
+
+export type AuthHandler = (
+	manager: ClientManager,
+	client: Client,
+	user: string,
+	password: string,
+	callback: (success: boolean) => void
+) => void;
+
+// The order defines priority: the first available plugin is used.
+// Always keep 'local' auth plugin at the end of the list; it should always be enabled.
+const plugins = [import("./auth/ldap"), import("./auth/local")];
+
+const toExport = {
+	moduleName: "<module with no name>",
+
+	// Must override: implements authentication mechanism
+	auth: () => unimplemented("auth"),
+
+	// Optional to override: implements filter for loading users at start up
+	// This allows an auth plugin to check if a user is still acceptable, if the plugin
+	// can do so without access to the user's unhashed password.
+	// Returning 'false' triggers fallback to default behaviour of loading all users
+	loadUsers: () => false,
+	// local auth should always be enabled, but check here to verify
+	initialized: false,
+	// TODO: fix typing
+	async initialize() {
+		if (toExport.initialized) {
+			return;
+		}
+
+		// Override default API stubs with exports from first enabled plugin found
+		const resolvedPlugins = await Promise.all(plugins);
+
+		for (const {default: plugin} of resolvedPlugins) {
+			if (plugin.isEnabled()) {
+				toExport.initialized = true;
+
+				for (const name in plugin) {
+					toExport[name] = plugin[name];
+				}
+
+				break;
+			}
+		}
+
+		if (!toExport.initialized) {
+			log.error("None of the auth plugins is enabled");
+		}
+	},
+} as any;
+
+function unimplemented(funcName: string) {
+	log.debug(
+		`Auth module ${colors.bold(toExport.moduleName)} doesn't implement function ${colors.bold(
+			funcName
+		)}`
+	);
+}
+
+// Default API implementations
+export default toExport;
diff --git a/src/plugins/auth/ldap.js b/server/plugins/auth/ldap.ts
similarity index 70%
rename from src/plugins/auth/ldap.js
rename to server/plugins/auth/ldap.ts
index 952d9d14..9e7a3e37 100644
--- a/src/plugins/auth/ldap.js
+++ b/server/plugins/auth/ldap.ts
@@ -1,11 +1,16 @@
-"use strict";
+import ldap, {SearchOptions} from "ldapjs";
+import colors from "chalk";
 
-const log = require("../../log");
-const Config = require("../../config");
-const ldap = require("ldapjs");
-const colors = require("chalk");
+import log from "../../log";
+import Config from "../../config";
+import type {AuthHandler} from "../auth";
 
-function ldapAuthCommon(user, bindDN, password, callback) {
+function ldapAuthCommon(
+	user: string,
+	bindDN: string,
+	password: string,
+	callback: (success: boolean) => void
+) {
 	const config = Config.values;
 
 	const ldapclient = ldap.createClient({
@@ -13,8 +18,8 @@ function ldapAuthCommon(user, bindDN, password, callback) {
 		tlsOptions: config.ldap.tlsOptions,
 	});
 
-	ldapclient.on("error", function (err) {
-		log.error(`Unable to connect to LDAP server: ${err}`);
+	ldapclient.on("error", function (err: Error) {
+		log.error(`Unable to connect to LDAP server: ${err.toString()}`);
 		callback(false);
 	});
 
@@ -22,7 +27,7 @@ function ldapAuthCommon(user, bindDN, password, callback) {
 		ldapclient.unbind();
 
 		if (err) {
-			log.error(`LDAP bind failed: ${err}`);
+			log.error(`LDAP bind failed: ${err.toString()}`);
 			callback(false);
 		} else {
 			callback(true);
@@ -30,7 +35,7 @@ function ldapAuthCommon(user, bindDN, password, callback) {
 	});
 }
 
-function simpleLdapAuth(user, password, callback) {
+function simpleLdapAuth(user: string, password: string, callback: (success: boolean) => void) {
 	if (!user || !password) {
 		return callback(false);
 	}
@@ -38,7 +43,7 @@ function simpleLdapAuth(user, password, callback) {
 	const config = Config.values;
 
 	const userDN = user.replace(/([,\\/#+<>;"= ])/g, "\\$1");
-	const bindDN = `${config.ldap.primaryKey}=${userDN},${config.ldap.baseDN}`;
+	const bindDN = `${config.ldap.primaryKey}=${userDN},${config.ldap.baseDN || ""}`;
 
 	log.info(`Auth against LDAP ${config.ldap.url} with provided bindDN ${bindDN}`);
 
@@ -48,7 +53,7 @@ function simpleLdapAuth(user, password, callback) {
 /**
  * LDAP auth using initial DN search (see config comment for ldap.searchDN)
  */
-function advancedLdapAuth(user, password, callback) {
+function advancedLdapAuth(user: string, password: string, callback: (success: boolean) => void) {
 	if (!user || !password) {
 		return callback(false);
 	}
@@ -66,10 +71,10 @@ function advancedLdapAuth(user, password, callback) {
 		scope: config.ldap.searchDN.scope,
 		filter: `(&(${config.ldap.primaryKey}=${userDN})${config.ldap.searchDN.filter})`,
 		attributes: ["dn"],
-	};
+	} as SearchOptions;
 
-	ldapclient.on("error", function (err) {
-		log.error(`Unable to connect to LDAP server: ${err}`);
+	ldapclient.on("error", function (err: Error) {
+		log.error(`Unable to connect to LDAP server: ${err.toString()}`);
 		callback(false);
 	});
 
@@ -94,14 +99,15 @@ function advancedLdapAuth(user, password, callback) {
 			res.on("searchEntry", function (entry) {
 				found = true;
 				const bindDN = entry.objectName;
-				log.info(`Auth against LDAP ${config.ldap.url} with found bindDN ${bindDN}`);
+				log.info(`Auth against LDAP ${config.ldap.url} with found bindDN ${bindDN || ""}`);
 				ldapclient.unbind();
 
-				ldapAuthCommon(user, bindDN, password, callback);
+				// TODO: Fix type !
+				ldapAuthCommon(user, bindDN!, password, callback);
 			});
 
-			res.on("error", function (err3) {
-				log.error(`LDAP error: ${err3}`);
+			res.on("error", function (err3: Error) {
+				log.error(`LDAP error: ${err3.toString()}`);
 				callback(false);
 			});
 
@@ -109,7 +115,11 @@ function advancedLdapAuth(user, password, callback) {
 				ldapclient.unbind();
 
 				if (!found) {
-					log.warn(`LDAP Search did not find anything for: ${userDN} (${result.status})`);
+					log.warn(
+						`LDAP Search did not find anything for: ${userDN} (${
+							result?.status.toString() || "unknown"
+						})`
+					);
 					callback(false);
 				}
 			});
@@ -117,12 +127,12 @@ function advancedLdapAuth(user, password, callback) {
 	});
 }
 
-function ldapAuth(manager, client, user, password, callback) {
+const ldapAuth: AuthHandler = (manager, client, user, password, callback) => {
 	// TODO: Enable the use of starttls() as an alternative to ldaps
 
 	// TODO: move this out of here and get rid of `manager` and `client` in
 	// auth plugin API
-	function callbackWrapper(valid) {
+	function callbackWrapper(valid: boolean) {
 		if (valid && !client) {
 			manager.addUser(user, null, true);
 		}
@@ -130,7 +140,7 @@ function ldapAuth(manager, client, user, password, callback) {
 		callback(valid);
 	}
 
-	let auth;
+	let auth: typeof simpleLdapAuth | typeof advancedLdapAuth;
 
 	if ("baseDN" in Config.values.ldap) {
 		auth = simpleLdapAuth;
@@ -139,14 +149,14 @@ function ldapAuth(manager, client, user, password, callback) {
 	}
 
 	return auth(user, password, callbackWrapper);
-}
+};
 
 /**
  * Use the LDAP filter from config to check that users still exist before loading them
  * via the supplied callback function.
  */
 
-function advancedLdapLoadUsers(users, callbackLoadUser) {
+function advancedLdapLoadUsers(users: string[], callbackLoadUser) {
 	const config = Config.values;
 
 	const ldapclient = ldap.createClient({
@@ -156,8 +166,8 @@ function advancedLdapLoadUsers(users, callbackLoadUser) {
 
 	const base = config.ldap.searchDN.base;
 
-	ldapclient.on("error", function (err) {
-		log.error(`Unable to connect to LDAP server: ${err}`);
+	ldapclient.on("error", function (err: Error) {
+		log.error(`Unable to connect to LDAP server: ${err.toString()}`);
 	});
 
 	ldapclient.bind(config.ldap.searchDN.rootDN, config.ldap.searchDN.rootPassword, function (err) {
@@ -173,16 +183,16 @@ function advancedLdapLoadUsers(users, callbackLoadUser) {
 			filter: `${config.ldap.searchDN.filter}`,
 			attributes: [config.ldap.primaryKey],
 			paged: true,
-		};
+		} as SearchOptions;
 
 		ldapclient.search(base, searchOptions, function (err2, res) {
 			if (err2) {
-				log.error(`LDAP search error: ${err2}`);
+				log.error(`LDAP search error: ${err2?.toString()}`);
 				return true;
 			}
 
 			res.on("searchEntry", function (entry) {
-				const user = entry.attributes[0]._vals[0].toString();
+				const user = entry.attributes[0].vals[0].toString();
 
 				if (remainingUsers.has(user)) {
 					remainingUsers.delete(user);
@@ -191,7 +201,7 @@ function advancedLdapLoadUsers(users, callbackLoadUser) {
 			});
 
 			res.on("error", function (err3) {
-				log.error(`LDAP error: ${err3}`);
+				log.error(`LDAP error: ${err3.toString()}`);
 			});
 
 			res.on("end", function () {
@@ -211,7 +221,7 @@ function advancedLdapLoadUsers(users, callbackLoadUser) {
 	return true;
 }
 
-function ldapLoadUsers(users, callbackLoadUser) {
+function ldapLoadUsers(users: string[], callbackLoadUser) {
 	if ("baseDN" in Config.values.ldap) {
 		// simple LDAP case can't test for user existence without access to the
 		// user's unhashed password, so indicate need to fallback to default
@@ -226,7 +236,7 @@ function isLdapEnabled() {
 	return !Config.values.public && Config.values.ldap.enable;
 }
 
-module.exports = {
+export default {
 	moduleName: "ldap",
 	auth: ldapAuth,
 	isEnabled: isLdapEnabled,
diff --git a/src/plugins/auth/local.js b/server/plugins/auth/local.ts
similarity index 77%
rename from src/plugins/auth/local.js
rename to server/plugins/auth/local.ts
index 1b062f31..70162016 100644
--- a/src/plugins/auth/local.js
+++ b/server/plugins/auth/local.ts
@@ -1,10 +1,9 @@
-"use strict";
+import colors from "chalk";
+import log from "../../log";
+import Helper from "../../helper";
+import type {AuthHandler} from "../auth";
 
-const log = require("../../log");
-const Helper = require("../../helper");
-const colors = require("chalk");
-
-function localAuth(manager, client, user, password, callback) {
+const localAuth: AuthHandler = (manager, client, user, password, callback) => {
 	// If no user is found, or if the client has not provided a password,
 	// fail the authentication straight away
 	if (!client || !password) {
@@ -41,11 +40,12 @@ function localAuth(manager, client, user, password, callback) {
 			callback(matching);
 		})
 		.catch((error) => {
+			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			log.error(`Error while checking users password. Error: ${error}`);
 		});
-}
+};
 
-module.exports = {
+export default {
 	moduleName: "local",
 	auth: localAuth,
 	isEnabled: () => true,
diff --git a/src/plugins/changelog.js b/server/plugins/changelog.ts
similarity index 54%
rename from src/plugins/changelog.js
rename to server/plugins/changelog.ts
index 5ffbdf3b..01e4039b 100644
--- a/src/plugins/changelog.js
+++ b/server/plugins/changelog.ts
@@ -1,23 +1,39 @@
-"use strict";
-
-const got = require("got");
-const colors = require("chalk");
-const log = require("../log");
-const pkg = require("../../package.json");
+import got, {Response} from "got";
+import colors from "chalk";
+import log from "../log";
+import pkg from "../../package.json";
+import ClientManager from "../clientManager";
 
 const TIME_TO_LIVE = 15 * 60 * 1000; // 15 minutes, in milliseconds
 
-module.exports = {
+export default {
 	isUpdateAvailable: false,
 	fetch,
 	checkForUpdates,
 };
+export type ChangelogData = {
+	current: {
+		version: string;
+		changelog?: string;
+	};
+	expiresAt: number;
+	latest?: {
+		prerelease: boolean;
+		version: string;
+		url: string;
+	};
+	packages?: boolean;
+};
 
 const versions = {
 	current: {
 		version: `v${pkg.version}`,
+		changelog: undefined,
 	},
-};
+	expiresAt: -1,
+	latest: undefined,
+	packages: undefined,
+} as ChangelogData;
 
 async function fetch() {
 	const time = Date.now();
@@ -44,15 +60,16 @@ async function fetch() {
 		// Add expiration date to the data to send to the client for later refresh
 		versions.expiresAt = time + TIME_TO_LIVE;
 	} catch (error) {
+		// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 		log.error(`Failed to fetch changelog: ${error}`);
 	}
 
 	return versions;
 }
 
-function updateVersions(response) {
-	let i;
-	let release;
+function updateVersions(response: Response<string>) {
+	let i: number;
+	let release: {tag_name: string; body_html: any; prerelease: boolean; html_url: any};
 	let prerelease = false;
 
 	const body = JSON.parse(response.body);
@@ -90,27 +107,31 @@ function updateVersions(response) {
 	}
 }
 
-function checkForUpdates(manager) {
-	fetch().then((versionData) => {
-		if (!module.exports.isUpdateAvailable) {
-			// Check for updates every 24 hours + random jitter of <3 hours
-			setTimeout(
-				() => checkForUpdates(manager),
-				24 * 3600 * 1000 + Math.floor(Math.random() * 10000000)
+function checkForUpdates(manager: ClientManager) {
+	fetch()
+		.then((versionData) => {
+			if (!module.exports.isUpdateAvailable) {
+				// Check for updates every 24 hours + random jitter of <3 hours
+				setTimeout(
+					() => checkForUpdates(manager),
+					24 * 3600 * 1000 + Math.floor(Math.random() * 10000000)
+				);
+			}
+
+			if (!versionData.latest) {
+				return;
+			}
+
+			log.info(
+				`The Lounge ${colors.green(
+					versionData.latest.version
+				)} is available. Read more on GitHub: ${versionData.latest.url}`
 			);
-		}
 
-		if (!versionData.latest) {
-			return;
-		}
-
-		log.info(
-			`The Lounge ${colors.green(
-				versionData.latest.version
-			)} is available. Read more on GitHub: ${versionData.latest.url}`
-		);
-
-		// Notify all connected clients about the new version
-		manager.clients.forEach((client) => client.emit("changelog:newversion"));
-	});
+			// Notify all connected clients about the new version
+			manager.clients.forEach((client) => client.emit("changelog:newversion"));
+		})
+		.catch((error: Error) => {
+			log.error(`Failed to check for updates: ${error.message}`);
+		});
 }
diff --git a/src/plugins/clientCertificate.js b/server/plugins/clientCertificate.ts
similarity index 77%
rename from src/plugins/clientCertificate.js
rename to server/plugins/clientCertificate.ts
index eb76d97e..c52ff967 100644
--- a/src/plugins/clientCertificate.js
+++ b/server/plugins/clientCertificate.ts
@@ -1,18 +1,21 @@
-"use strict";
+import path from "path";
+import fs from "fs";
+import crypto from "crypto";
+import {md, pki} from "node-forge";
+import log from "../log";
+import Config from "../config";
 
-const path = require("path");
-const fs = require("fs");
-const crypto = require("crypto");
-const {md, pki} = require("node-forge");
-const log = require("../log");
-const Config = require("../config");
-
-module.exports = {
+export default {
 	get,
 	remove,
 };
 
-function get(uuid) {
+export type ClientCertificateType = {
+	private_key: string;
+	certificate: string;
+};
+
+function get(uuid: string): ClientCertificateType | null {
 	if (Config.values.public) {
 		return null;
 	}
@@ -28,15 +31,15 @@ function get(uuid) {
 		return {
 			private_key: fs.readFileSync(paths.privateKeyPath, "utf-8"),
 			certificate: fs.readFileSync(paths.certificatePath, "utf-8"),
-		};
-	} catch (e) {
+		} as ClientCertificateType;
+	} catch (e: any) {
 		log.error("Unable to get certificate", e);
 	}
 
 	return null;
 }
 
-function remove(uuid) {
+function remove(uuid: string) {
 	if (Config.values.public) {
 		return null;
 	}
@@ -51,12 +54,12 @@ function remove(uuid) {
 		if (fs.existsSync(paths.certificatePath)) {
 			fs.unlinkSync(paths.certificatePath);
 		}
-	} catch (e) {
+	} catch (e: any) {
 		log.error("Unable to remove certificate", e);
 	}
 }
 
-function generateAndWrite(folderPath, paths) {
+function generateAndWrite(folderPath: string, paths: {privateKeyPath: any; certificatePath: any}) {
 	const certificate = generate();
 
 	try {
@@ -70,8 +73,8 @@ function generateAndWrite(folderPath, paths) {
 		});
 
 		return certificate;
-	} catch (e) {
-		log.error("Unable to write certificate", e);
+	} catch (e: any) {
+		log.error("Unable to write certificate", String(e));
 	}
 
 	return null;
@@ -92,6 +95,7 @@ function generate() {
 	// Set notAfter 100 years into the future just in case
 	// the server actually validates this field
 	cert.validity.notAfter = new Date();
+	// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 	cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 100);
 
 	const attrs = [
@@ -121,12 +125,12 @@ function generate() {
 	const pem = {
 		private_key: pki.privateKeyToPem(keys.privateKey),
 		certificate: pki.certificateToPem(cert),
-	};
+	} as ClientCertificateType;
 
 	return pem;
 }
 
-function getPaths(folderPath, uuid) {
+function getPaths(folderPath: string, uuid: string) {
 	return {
 		privateKeyPath: path.join(folderPath, `${uuid}.pem`),
 		certificatePath: path.join(folderPath, `${uuid}.crt`),
diff --git a/server/plugins/dev-server.ts b/server/plugins/dev-server.ts
new file mode 100644
index 00000000..5c2456c5
--- /dev/null
+++ b/server/plugins/dev-server.ts
@@ -0,0 +1,42 @@
+import webpackDevMiddleware from "webpack-dev-middleware";
+import webpackHotMiddleware from "webpack-hot-middleware";
+import express from "express";
+
+import log from "../log";
+
+import webpack from "webpack";
+import config from "../../webpack.config";
+
+export default (app: express.Application) => {
+	log.debug("Starting server in development mode");
+
+	const webpackConfig = config(undefined, {mode: "production"});
+
+	if (
+		!webpackConfig ||
+		!webpackConfig.plugins?.length ||
+		!webpackConfig.entry ||
+		!webpackConfig.entry["js/bundle.js"]
+	) {
+		throw new Error("No valid production webpack config found");
+	}
+
+	webpackConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
+	webpackConfig.entry["js/bundle.js"].push(
+		"webpack-hot-middleware/client?path=storage/__webpack_hmr"
+	);
+
+	const compiler = webpack(webpackConfig);
+
+	app.use(
+		webpackDevMiddleware(compiler, {
+			index: "/",
+			publicPath: webpackConfig.output?.publicPath,
+		})
+	).use(
+		// TODO: Fix compiler type
+		webpackHotMiddleware(compiler as any, {
+			path: "/storage/__webpack_hmr",
+		})
+	);
+};
diff --git a/src/plugins/inputs/action.js b/server/plugins/inputs/action.ts
similarity index 60%
rename from src/plugins/inputs/action.js
rename to server/plugins/inputs/action.ts
index 8e03b761..a85bc28d 100644
--- a/src/plugins/inputs/action.js
+++ b/server/plugins/inputs/action.ts
@@ -1,16 +1,15 @@
-"use strict";
+import {PluginInputHandler} from "./index";
+import Msg, {MessageType} from "../../models/msg";
+import {ChanType} from "../../models/chan";
 
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
+const commands = ["slap", "me"];
 
-exports.commands = ["slap", "me"];
-
-exports.input = function ({irc}, chan, cmd, args) {
-	if (chan.type !== Chan.Type.CHANNEL && chan.type !== Chan.Type.QUERY) {
+const input: PluginInputHandler = function ({irc}, chan, cmd, args) {
+	if (chan.type !== ChanType.CHANNEL && chan.type !== ChanType.QUERY) {
 		chan.pushMessage(
 			this,
 			new Msg({
-				type: Msg.Type.ERROR,
+				type: MessageType.ERROR,
 				text: `${cmd} command can only be used in channels and queries.`,
 			})
 		);
@@ -46,3 +45,8 @@ exports.input = function ({irc}, chan, cmd, args) {
 
 	return true;
 };
+
+export default {
+	commands,
+	input,
+};
diff --git a/src/plugins/inputs/away.js b/server/plugins/inputs/away.ts
similarity index 53%
rename from src/plugins/inputs/away.js
rename to server/plugins/inputs/away.ts
index acafdc49..c9e3b398 100644
--- a/src/plugins/inputs/away.js
+++ b/server/plugins/inputs/away.ts
@@ -1,8 +1,7 @@
-"use strict";
+const commands = ["away", "back"];
+import {PluginInputHandler} from "./index";
 
-exports.commands = ["away", "back"];
-
-exports.input = function (network, chan, cmd, args) {
+const input: PluginInputHandler = function (network, chan, cmd, args) {
 	let reason = "";
 
 	if (cmd === "away") {
@@ -18,3 +17,8 @@ exports.input = function (network, chan, cmd, args) {
 
 	this.save();
 };
+
+export default {
+	commands,
+	input,
+};
diff --git a/src/plugins/inputs/ban.js b/server/plugins/inputs/ban.ts
similarity index 60%
rename from src/plugins/inputs/ban.js
rename to server/plugins/inputs/ban.ts
index 07f3f646..b8a752b4 100644
--- a/src/plugins/inputs/ban.js
+++ b/server/plugins/inputs/ban.ts
@@ -1,16 +1,15 @@
-"use strict";
+import {ChanType} from "../../models/chan";
+import Msg, {MessageType} from "../../models/msg";
+import {PluginInputHandler} from "./index";
 
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
+const commands = ["ban", "unban", "banlist", "kickban"];
 
-exports.commands = ["ban", "unban", "banlist", "kickban"];
-
-exports.input = function ({irc}, chan, cmd, args) {
-	if (chan.type !== Chan.Type.CHANNEL) {
+const input: PluginInputHandler = function ({irc}, chan, cmd, args) {
+	if (chan.type !== ChanType.CHANNEL) {
 		chan.pushMessage(
 			this,
 			new Msg({
-				type: Msg.Type.ERROR,
+				type: MessageType.ERROR,
 				text: `${cmd} command can only be used in channels.`,
 			})
 		);
@@ -23,7 +22,7 @@ exports.input = function ({irc}, chan, cmd, args) {
 			chan.pushMessage(
 				this,
 				new Msg({
-					type: Msg.Type.ERROR,
+					type: MessageType.ERROR,
 					text: `Usage: /${cmd} <nick>`,
 				})
 			);
@@ -47,3 +46,8 @@ exports.input = function ({irc}, chan, cmd, args) {
 			break;
 	}
 };
+
+export default {
+	commands,
+	input,
+};
diff --git a/src/plugins/inputs/connect.js b/server/plugins/inputs/connect.ts
similarity index 61%
rename from src/plugins/inputs/connect.js
rename to server/plugins/inputs/connect.ts
index da98f5c0..8ba60c20 100644
--- a/src/plugins/inputs/connect.js
+++ b/server/plugins/inputs/connect.ts
@@ -1,11 +1,10 @@
-"use strict";
+import Msg, {MessageType} from "../../models/msg";
+import {PluginInputHandler} from "./index";
 
-const Msg = require("../../models/msg");
+const commands = ["connect", "server"];
+const allowDisconnected = true;
 
-exports.commands = ["connect", "server"];
-exports.allowDisconnected = true;
-
-exports.input = function (network, chan, cmd, args) {
+const input: PluginInputHandler = function (network, chan, cmd, args) {
 	if (args.length === 0) {
 		network.userDisconnected = false;
 		this.save();
@@ -20,7 +19,7 @@ exports.input = function (network, chan, cmd, args) {
 			chan.pushMessage(
 				this,
 				new Msg({
-					type: Msg.Type.ERROR,
+					type: MessageType.ERROR,
 					text: "You are already connected.",
 				})
 			);
@@ -44,3 +43,9 @@ exports.input = function (network, chan, cmd, args) {
 
 	return true;
 };
+
+export default {
+	commands,
+	input,
+	allowDisconnected,
+};
diff --git a/server/plugins/inputs/ctcp.ts b/server/plugins/inputs/ctcp.ts
new file mode 100644
index 00000000..eb4ec4b7
--- /dev/null
+++ b/server/plugins/inputs/ctcp.ts
@@ -0,0 +1,37 @@
+import Msg, {MessageType} from "../../models/msg";
+import {PluginInputHandler} from "./index";
+
+const commands = ["ctcp"];
+
+const input: PluginInputHandler = function ({irc}, chan, cmd, args) {
+	if (args.length < 2) {
+		chan.pushMessage(
+			this,
+			new Msg({
+				type: MessageType.ERROR,
+				text: "Usage: /ctcp <nick> <ctcp_type>",
+			})
+		);
+		return;
+	}
+
+	const target = args.shift()!;
+
+	chan.pushMessage(
+		this,
+		new Msg({
+			type: MessageType.CTCP_REQUEST,
+			ctcpMessage: `"${target}" to ${args[0]}`,
+			from: chan.getUser(irc.user.nick),
+		})
+	);
+
+	const type = args.shift()!;
+
+	irc.ctcpRequest(target, type, ...args);
+};
+
+export default {
+	commands,
+	input,
+};
diff --git a/server/plugins/inputs/disconnect.ts b/server/plugins/inputs/disconnect.ts
new file mode 100644
index 00000000..4014fcae
--- /dev/null
+++ b/server/plugins/inputs/disconnect.ts
@@ -0,0 +1,19 @@
+import {PluginInputHandler} from "./index";
+
+const commands = ["disconnect"];
+const allowDisconnected = true;
+
+const input: PluginInputHandler = function (network, chan, cmd, args) {
+	const quitMessage = args[0] ? args.join(" ") : undefined;
+
+	network.quit(quitMessage);
+	network.userDisconnected = true;
+
+	this.save();
+};
+
+export default {
+	commands,
+	input,
+	allowDisconnected,
+};
diff --git a/src/plugins/inputs/ignore.js b/server/plugins/inputs/ignore.ts
similarity index 60%
rename from src/plugins/inputs/ignore.js
rename to server/plugins/inputs/ignore.ts
index b2e2dfd9..a55e6030 100644
--- a/src/plugins/inputs/ignore.js
+++ b/server/plugins/inputs/ignore.ts
@@ -1,21 +1,22 @@
-"use strict";
+import Msg, {MessageType} from "../../models/msg";
+import Helper from "../../helper";
+import {PluginInputHandler} from "./index";
+import {IgnoreListItem} from "../../models/network";
+import {ChanType, SpecialChanType} from "../../models/chan";
 
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
-const Helper = require("../../helper");
+const commands = ["ignore", "unignore", "ignorelist"];
 
-exports.commands = ["ignore", "unignore", "ignorelist"];
-
-exports.input = function (network, chan, cmd, args) {
+const input: PluginInputHandler = function (network, chan, cmd, args) {
 	const client = this;
-	let target;
-	let hostmask;
+	let target: string;
+	// let hostmask: cmd === "ignoreList" ? string : undefined;
+	let hostmask: IgnoreListItem | undefined;
 
 	if (cmd !== "ignorelist" && (args.length === 0 || args[0].trim().length === 0)) {
 		chan.pushMessage(
 			client,
 			new Msg({
-				type: Msg.Type.ERROR,
+				type: MessageType.ERROR,
 				text: `Usage: /${cmd} <nick>[!ident][@host]`,
 			})
 		);
@@ -26,41 +27,43 @@ exports.input = function (network, chan, cmd, args) {
 	if (cmd !== "ignorelist") {
 		// Trim to remove any spaces from the hostmask
 		target = args[0].trim();
-		hostmask = Helper.parseHostmask(target);
+		hostmask = Helper.parseHostmask(target) as IgnoreListItem;
 	}
 
 	switch (cmd) {
 		case "ignore": {
 			// IRC nicks are case insensitive
-			if (hostmask.nick.toLowerCase() === network.nick.toLowerCase()) {
+			if (hostmask!.nick.toLowerCase() === network.nick.toLowerCase()) {
 				chan.pushMessage(
 					client,
 					new Msg({
-						type: Msg.Type.ERROR,
+						type: MessageType.ERROR,
 						text: "You can't ignore yourself",
 					})
 				);
 			} else if (
 				!network.ignoreList.some(function (entry) {
-					return Helper.compareHostmask(entry, hostmask);
+					return Helper.compareHostmask(entry, hostmask!);
 				})
 			) {
-				hostmask.when = Date.now();
-				network.ignoreList.push(hostmask);
+				hostmask!.when = Date.now();
+				network.ignoreList.push(hostmask!);
 
 				client.save();
 				chan.pushMessage(
 					client,
 					new Msg({
-						type: Msg.Type.ERROR,
-						text: `\u0002${hostmask.nick}!${hostmask.ident}@${hostmask.hostname}\u000f added to ignorelist`,
+						type: MessageType.ERROR,
+						text: `\u0002${hostmask!.nick}!${hostmask!.ident}@${
+							hostmask!.hostname
+						}\u000f added to ignorelist`,
 					})
 				);
 			} else {
 				chan.pushMessage(
 					client,
 					new Msg({
-						type: Msg.Type.ERROR,
+						type: MessageType.ERROR,
 						text: "The specified user/hostmask is already ignored",
 					})
 				);
@@ -71,7 +74,7 @@ exports.input = function (network, chan, cmd, args) {
 
 		case "unignore": {
 			const idx = network.ignoreList.findIndex(function (entry) {
-				return Helper.compareHostmask(entry, hostmask);
+				return Helper.compareHostmask(entry, hostmask!);
 			});
 
 			// Check if the entry exists before removing it, otherwise
@@ -83,15 +86,17 @@ exports.input = function (network, chan, cmd, args) {
 				chan.pushMessage(
 					client,
 					new Msg({
-						type: Msg.Type.ERROR,
-						text: `Successfully removed \u0002${hostmask.nick}!${hostmask.ident}@${hostmask.hostname}\u000f from ignorelist`,
+						type: MessageType.ERROR,
+						text: `Successfully removed \u0002${hostmask!.nick}!${hostmask!.ident}@${
+							hostmask!.hostname
+						}\u000f from ignorelist`,
 					})
 				);
 			} else {
 				chan.pushMessage(
 					client,
 					new Msg({
-						type: Msg.Type.ERROR,
+						type: MessageType.ERROR,
 						text: "The specified user/hostmask is not ignored",
 					})
 				);
@@ -105,7 +110,7 @@ exports.input = function (network, chan, cmd, args) {
 				chan.pushMessage(
 					client,
 					new Msg({
-						type: Msg.Type.ERROR,
+						type: MessageType.ERROR,
 						text: "Ignorelist is empty",
 					})
 				);
@@ -119,8 +124,8 @@ exports.input = function (network, chan, cmd, args) {
 
 				if (typeof newChan === "undefined") {
 					newChan = client.createChannel({
-						type: Chan.Type.SPECIAL,
-						special: Chan.SpecialType.IGNORELIST,
+						type: ChanType.SPECIAL,
+						special: SpecialChanType.IGNORELIST,
 						name: chanName,
 						data: ignored,
 					});
@@ -130,6 +135,7 @@ exports.input = function (network, chan, cmd, args) {
 						index: network.addChannel(newChan),
 					});
 				} else {
+					// TODO: add type for this chan/event
 					newChan.data = ignored;
 
 					client.emit("msg:special", {
@@ -142,3 +148,8 @@ exports.input = function (network, chan, cmd, args) {
 			break;
 	}
 };
+
+export default {
+	commands,
+	input,
+};
diff --git a/server/plugins/inputs/index.ts b/server/plugins/inputs/index.ts
new file mode 100644
index 00000000..e3390361
--- /dev/null
+++ b/server/plugins/inputs/index.ts
@@ -0,0 +1,102 @@
+import Client from "../../client";
+import log from "../../log";
+import Chan, {Channel} from "../../models/chan";
+import Network, {NetworkWithIrcFramework} from "../../models/network";
+import {PackageInfo} from "../packages";
+
+export type PluginInputHandler = (
+	this: Client,
+	network: NetworkWithIrcFramework,
+	chan: Channel,
+	cmd: string,
+	args: string[]
+) => void;
+
+type Plugin = {
+	commands: string[];
+	input: (network: Network, chan: Chan, cmd: string, args: string[]) => void;
+	allowDisconnected?: boolean | undefined;
+};
+
+const clientSideCommands = ["/collapse", "/expand", "/search"];
+
+const passThroughCommands = [
+	"/as",
+	"/bs",
+	"/cs",
+	"/ho",
+	"/hs",
+	"/join",
+	"/ms",
+	"/ns",
+	"/os",
+	"/rs",
+];
+
+const userInputs = new Map<string, Plugin>();
+const builtInInputs = [
+	"action",
+	"away",
+	"ban",
+	"connect",
+	"ctcp",
+	"disconnect",
+	"ignore",
+	"invite",
+	"kick",
+	"kill",
+	"list",
+	"mode",
+	"msg",
+	"nick",
+	"notice",
+	"part",
+	"quit",
+	"raw",
+	"rejoin",
+	"topic",
+	"whois",
+	"mute",
+];
+
+for (const input of builtInInputs) {
+	import(`./${input}`)
+		.then(
+			(plugin: {
+				default: {
+					commands: string[];
+					input: (network: Network, chan: Chan, cmd: string, args: string[]) => void;
+					allowDisconnected?: boolean;
+				};
+			}) => {
+				plugin.default.commands.forEach((command: string) =>
+					userInputs.set(command, plugin.default)
+				);
+			}
+		)
+		.catch((err) => {
+			log.error(err);
+		});
+}
+
+const pluginCommands = new Map();
+
+const getCommands = () =>
+	Array.from(userInputs.keys())
+		.concat(Array.from(pluginCommands.keys()))
+		.map((command) => `/${command}`)
+		.concat(clientSideCommands)
+		.concat(passThroughCommands)
+		.sort();
+
+const addPluginCommand = (packageInfo: PackageInfo, command, func) => {
+	func.packageInfo = packageInfo;
+	pluginCommands.set(command, func);
+};
+
+export default {
+	addPluginCommand,
+	getCommands,
+	pluginCommands,
+	userInputs,
+};
diff --git a/src/plugins/inputs/invite.js b/server/plugins/inputs/invite.ts
similarity index 50%
rename from src/plugins/inputs/invite.js
rename to server/plugins/inputs/invite.ts
index 962cfb33..ebe221a1 100644
--- a/src/plugins/inputs/invite.js
+++ b/server/plugins/inputs/invite.ts
@@ -1,11 +1,10 @@
-"use strict";
+import {PluginInputHandler} from "./index";
+import Msg, {MessageType} from "../../models/msg";
+import {ChanType} from "../../models/chan";
 
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
+const commands = ["invite", "invitelist"];
 
-exports.commands = ["invite", "invitelist"];
-
-exports.input = function ({irc}, chan, cmd, args) {
+const input: PluginInputHandler = function ({irc}, chan, cmd, args) {
 	if (cmd === "invitelist") {
 		irc.inviteList(chan.name);
 		return;
@@ -13,15 +12,20 @@ exports.input = function ({irc}, chan, cmd, args) {
 
 	if (args.length === 2) {
 		irc.raw("INVITE", args[0], args[1]); // Channel provided in the command
-	} else if (args.length === 1 && chan.type === Chan.Type.CHANNEL) {
+	} else if (args.length === 1 && chan.type === ChanType.CHANNEL) {
 		irc.raw("INVITE", args[0], chan.name); // Current channel
 	} else {
 		chan.pushMessage(
 			this,
 			new Msg({
-				type: Msg.Type.ERROR,
+				type: MessageType.ERROR,
 				text: `${cmd} command can only be used in channels or by specifying a target.`,
 			})
 		);
 	}
 };
+
+export default {
+	commands,
+	input,
+};
diff --git a/server/plugins/inputs/kick.ts b/server/plugins/inputs/kick.ts
new file mode 100644
index 00000000..7bfcfe06
--- /dev/null
+++ b/server/plugins/inputs/kick.ts
@@ -0,0 +1,30 @@
+import {PluginInputHandler} from "./index";
+import Msg, {MessageType} from "../../models/msg";
+import {ChanType} from "../../models/chan";
+
+const commands = ["kick"];
+
+const input: PluginInputHandler = function ({irc}, chan, cmd, args) {
+	if (chan.type !== ChanType.CHANNEL) {
+		chan.pushMessage(
+			this,
+			new Msg({
+				type: MessageType.ERROR,
+				text: `${cmd} command can only be used in channels.`,
+			})
+		);
+
+		return;
+	}
+
+	if (args.length !== 0) {
+		irc.raw("KICK", chan.name, args[0], args.slice(1).join(" "));
+	}
+
+	return true;
+};
+
+export default {
+	commands,
+	input,
+};
diff --git a/server/plugins/inputs/kill.ts b/server/plugins/inputs/kill.ts
new file mode 100644
index 00000000..60de3576
--- /dev/null
+++ b/server/plugins/inputs/kill.ts
@@ -0,0 +1,16 @@
+import {PluginInputHandler} from "./index";
+
+const commands = ["kill"];
+
+const input: PluginInputHandler = function ({irc}, chan, cmd, args) {
+	if (args.length !== 0) {
+		irc.raw("KILL", args[0], args.slice(1).join(" "));
+	}
+
+	return true;
+};
+
+export default {
+	commands,
+	input,
+};
diff --git a/server/plugins/inputs/list.ts b/server/plugins/inputs/list.ts
new file mode 100644
index 00000000..48c797ce
--- /dev/null
+++ b/server/plugins/inputs/list.ts
@@ -0,0 +1,14 @@
+import {PluginInputHandler} from "./index";
+
+const commands = ["list"];
+
+const input: PluginInputHandler = function (network, chan, cmd, args) {
+	network.chanCache = [];
+	network.irc.list(...args);
+	return true;
+};
+
+export default {
+	commands,
+	input,
+};
diff --git a/src/plugins/inputs/mode.js b/server/plugins/inputs/mode.ts
similarity index 60%
rename from src/plugins/inputs/mode.js
rename to server/plugins/inputs/mode.ts
index 1503b54b..4e427682 100644
--- a/src/plugins/inputs/mode.js
+++ b/server/plugins/inputs/mode.ts
@@ -1,21 +1,21 @@
-"use strict";
+import {PluginInputHandler} from "./index";
 
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
+import {ChanType} from "../../models/chan";
 
-exports.commands = ["mode", "umode", "op", "deop", "hop", "dehop", "voice", "devoice"];
+const commands = ["mode", "umode", "op", "deop", "hop", "dehop", "voice", "devoice"];
 
-exports.input = function ({irc, nick}, chan, cmd, args) {
+const input: PluginInputHandler = function ({irc, nick}, chan, cmd, args) {
 	if (cmd === "umode") {
 		irc.raw("MODE", nick, ...args);
 
 		return;
 	} else if (cmd !== "mode") {
-		if (chan.type !== Chan.Type.CHANNEL) {
+		if (chan.type !== ChanType.CHANNEL) {
 			chan.pushMessage(
 				this,
 				new Msg({
-					type: Msg.Type.ERROR,
+					type: MessageType.ERROR,
 					text: `${cmd} command can only be used in channels.`,
 				})
 			);
@@ -29,7 +29,7 @@ exports.input = function ({irc, nick}, chan, cmd, args) {
 			chan.pushMessage(
 				this,
 				new Msg({
-					type: Msg.Type.ERROR,
+					type: MessageType.ERROR,
 					text: `Usage: /${cmd} <nick> [...nick]`,
 				})
 			);
@@ -50,7 +50,7 @@ exports.input = function ({irc, nick}, chan, cmd, args) {
 
 		for (let i = 0; i < target.length; i += limit) {
 			const targets = target.slice(i, i + limit);
-			const amode = `${mode[0]}${mode[1].repeat(targets.length)}`;
+			const amode = `${mode![0]}${mode![1].repeat(targets.length)}`;
 			irc.raw("MODE", chan.name, amode, ...targets);
 		}
 
@@ -59,9 +59,14 @@ exports.input = function ({irc, nick}, chan, cmd, args) {
 
 	if (args.length === 0 || args[0][0] === "+" || args[0][0] === "-") {
 		args.unshift(
-			chan.type === Chan.Type.CHANNEL || chan.type === Chan.Type.QUERY ? chan.name : nick
+			chan.type === ChanType.CHANNEL || chan.type === ChanType.QUERY ? chan.name : nick
 		);
 	}
 
 	irc.raw("MODE", ...args);
 };
+
+export default {
+	commands,
+	input,
+};
diff --git a/src/plugins/inputs/msg.js b/server/plugins/inputs/msg.ts
similarity index 77%
rename from src/plugins/inputs/msg.js
rename to server/plugins/inputs/msg.ts
index f5f0fde7..8aba0767 100644
--- a/src/plugins/inputs/msg.js
+++ b/server/plugins/inputs/msg.ts
@@ -1,11 +1,10 @@
-"use strict";
+import {PluginInputHandler} from "./index";
+import Msg, {MessageType} from "../../models/msg";
+import Chan, {ChanType} from "../../models/chan";
 
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
+const commands = ["query", "msg", "say"];
 
-exports.commands = ["query", "msg", "say"];
-
-function getTarget(cmd, args, chan) {
+function getTarget(cmd: string, args: string[], chan: Chan) {
 	switch (cmd) {
 		case "msg":
 		case "query":
@@ -15,7 +14,7 @@ function getTarget(cmd, args, chan) {
 	}
 }
 
-exports.input = function (network, chan, cmd, args) {
+const input: PluginInputHandler = function (network, chan, cmd, args) {
 	let targetName = getTarget(cmd, args, chan);
 
 	if (cmd === "query") {
@@ -23,7 +22,7 @@ exports.input = function (network, chan, cmd, args) {
 			chan.pushMessage(
 				this,
 				new Msg({
-					type: Msg.Type.ERROR,
+					type: MessageType.ERROR,
 					text: "You cannot open a query window without an argument.",
 				})
 			);
@@ -42,7 +41,7 @@ exports.input = function (network, chan, cmd, args) {
 				chan.pushMessage(
 					this,
 					new Msg({
-						type: Msg.Type.ERROR,
+						type: MessageType.ERROR,
 						text: "You can not open query windows for channels, use /join instead.",
 					})
 				);
@@ -54,7 +53,7 @@ exports.input = function (network, chan, cmd, args) {
 					chan.pushMessage(
 						this,
 						new Msg({
-							type: Msg.Type.ERROR,
+							type: MessageType.ERROR,
 							text: "You can not open query windows for names starting with a user prefix.",
 						})
 					);
@@ -63,7 +62,7 @@ exports.input = function (network, chan, cmd, args) {
 			}
 
 			const newChan = this.createChannel({
-				type: Chan.Type.QUERY,
+				type: ChanType.QUERY,
 				name: targetName,
 			});
 
@@ -78,7 +77,11 @@ exports.input = function (network, chan, cmd, args) {
 		}
 	}
 
-	if (args.length === 0 || !targetName) {
+	if (args.length === 0) {
+		return true;
+	}
+
+	if (!targetName) {
 		return true;
 	}
 
@@ -95,7 +98,7 @@ exports.input = function (network, chan, cmd, args) {
 		let targetGroup;
 
 		if (parsedTarget) {
-			targetName = parsedTarget.target;
+			targetName = parsedTarget.target as string;
 			targetGroup = parsedTarget.target_group;
 		}
 
@@ -115,3 +118,8 @@ exports.input = function (network, chan, cmd, args) {
 
 	return true;
 };
+
+export default {
+	commands,
+	input,
+};
diff --git a/src/plugins/inputs/mute.js b/server/plugins/inputs/mute.ts
similarity index 61%
rename from src/plugins/inputs/mute.js
rename to server/plugins/inputs/mute.ts
index dda17582..bf553549 100644
--- a/src/plugins/inputs/mute.js
+++ b/server/plugins/inputs/mute.ts
@@ -1,10 +1,16 @@
-"use strict";
-const Msg = require("../../models/msg");
+import Chan from "../../models/chan";
+import Network from "../../models/network";
+import {PluginInputHandler} from "./index";
 
-exports.commands = ["mute", "unmute"];
+import Msg, {MessageType} from "../../models/msg";
 
-function args_to_channels(network, args) {
-	const targets = [];
+import Client from "../../client";
+
+const commands = ["mute", "unmute"];
+const allowDisconnected = true;
+
+function args_to_channels(network: Network, args: string[]) {
+	const targets: Chan[] = [];
 
 	for (const arg of args) {
 		const target = network.channels.find((c) => c.name === arg);
@@ -17,7 +23,7 @@ function args_to_channels(network, args) {
 	return targets;
 }
 
-function change_mute_state(client, target, valueToSet) {
+function change_mute_state(client: Client, target: Chan, valueToSet: boolean) {
 	if (target.type === "special") {
 		return;
 	}
@@ -29,7 +35,7 @@ function change_mute_state(client, target, valueToSet) {
 	});
 }
 
-exports.input = function (network, chan, cmd, args) {
+const input: PluginInputHandler = function (network, chan, cmd, args) {
 	const valueToSet = cmd === "mute" ? true : false;
 	const client = this;
 
@@ -46,7 +52,7 @@ exports.input = function (network, chan, cmd, args) {
 		chan.pushMessage(
 			client,
 			new Msg({
-				type: Msg.Type.ERROR,
+				type: MessageType.ERROR,
 				text: `No open ${
 					missing.length === 1 ? "channel or user" : "channels or users"
 				} found for ${missing.join(",")}`,
@@ -59,3 +65,9 @@ exports.input = function (network, chan, cmd, args) {
 		change_mute_state(client, target, valueToSet);
 	}
 };
+
+export default {
+	commands,
+	input,
+	allowDisconnected,
+};
diff --git a/src/plugins/inputs/nick.js b/server/plugins/inputs/nick.ts
similarity index 72%
rename from src/plugins/inputs/nick.js
rename to server/plugins/inputs/nick.ts
index 40e180eb..abccf723 100644
--- a/src/plugins/inputs/nick.js
+++ b/server/plugins/inputs/nick.ts
@@ -1,16 +1,16 @@
-"use strict";
+import {PluginInputHandler} from "./index";
 
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-exports.commands = ["nick"];
-exports.allowDisconnected = true;
+const commands = ["nick"];
+const allowDisconnected = true;
 
-exports.input = function (network, chan, cmd, args) {
+const input: PluginInputHandler = function (network, chan, cmd, args) {
 	if (args.length === 0) {
 		chan.pushMessage(
 			this,
 			new Msg({
-				type: Msg.Type.ERROR,
+				type: MessageType.ERROR,
 				text: "Usage: /nick <your new nick>",
 			})
 		);
@@ -21,7 +21,7 @@ exports.input = function (network, chan, cmd, args) {
 		chan.pushMessage(
 			this,
 			new Msg({
-				type: Msg.Type.ERROR,
+				type: MessageType.ERROR,
 				text: "Nicknames may not contain spaces.",
 			})
 		);
@@ -34,7 +34,7 @@ exports.input = function (network, chan, cmd, args) {
 		chan.pushMessage(
 			this,
 			new Msg({
-				type: Msg.Type.ERROR,
+				type: MessageType.ERROR,
 				text: "Nicknames may not be this long.",
 			})
 		);
@@ -65,3 +65,9 @@ exports.input = function (network, chan, cmd, args) {
 
 	this.save();
 };
+
+export default {
+	commands,
+	input,
+	allowDisconnected,
+};
diff --git a/src/plugins/inputs/notice.js b/server/plugins/inputs/notice.ts
similarity index 79%
rename from src/plugins/inputs/notice.js
rename to server/plugins/inputs/notice.ts
index 6569719f..5275833f 100644
--- a/src/plugins/inputs/notice.js
+++ b/server/plugins/inputs/notice.ts
@@ -1,8 +1,8 @@
-"use strict";
+import {PluginInputHandler} from "./index";
 
-exports.commands = ["notice"];
+const commands = ["notice"];
 
-exports.input = function (network, chan, cmd, args) {
+const input: PluginInputHandler = function (network, chan, cmd, args) {
 	if (!args[1]) {
 		return;
 	}
@@ -37,3 +37,8 @@ exports.input = function (network, chan, cmd, args) {
 
 	return true;
 };
+
+export default {
+	commands,
+	input,
+};
diff --git a/src/plugins/inputs/part.js b/server/plugins/inputs/part.ts
similarity index 60%
rename from src/plugins/inputs/part.js
rename to server/plugins/inputs/part.ts
index 00c78893..bf352ce6 100644
--- a/src/plugins/inputs/part.js
+++ b/server/plugins/inputs/part.ts
@@ -1,13 +1,13 @@
-"use strict";
+import {PluginInputHandler} from "./index";
 
-const Msg = require("../../models/msg");
-const Chan = require("../../models/chan");
-const Config = require("../../config");
+import Msg, {MessageType} from "../../models/msg";
+import Config from "../../config";
+import {ChanType, ChanState} from "../../models/chan";
 
-exports.commands = ["close", "leave", "part"];
-exports.allowDisconnected = true;
+const commands = ["close", "leave", "part"];
+const allowDisconnected = true;
 
-exports.input = function (network, chan, cmd, args) {
+const input: PluginInputHandler = function (network, chan, cmd, args) {
 	let target = chan;
 
 	if (args.length > 0) {
@@ -20,11 +20,11 @@ exports.input = function (network, chan, cmd, args) {
 		}
 	}
 
-	if (target.type === Chan.Type.LOBBY) {
+	if (target.type === ChanType.LOBBY) {
 		chan.pushMessage(
 			this,
 			new Msg({
-				type: Msg.Type.ERROR,
+				type: MessageType.ERROR,
 				text: "You can not part from networks, use /quit instead.",
 			})
 		);
@@ -34,8 +34,8 @@ exports.input = function (network, chan, cmd, args) {
 	// If target is not a channel or we are not connected, instantly remove the channel
 	// Otherwise send part to the server and wait for response
 	if (
-		target.type !== Chan.Type.CHANNEL ||
-		target.state === Chan.State.PARTED ||
+		target.type !== ChanType.CHANNEL ||
+		target.state === ChanState.PARTED ||
 		!network.irc ||
 		!network.irc.connection ||
 		!network.irc.connection.connected
@@ -48,3 +48,9 @@ exports.input = function (network, chan, cmd, args) {
 
 	return true;
 };
+
+export default {
+	commands,
+	input,
+	allowDisconnected,
+};
diff --git a/server/plugins/inputs/quit.ts b/server/plugins/inputs/quit.ts
new file mode 100644
index 00000000..ca5f5970
--- /dev/null
+++ b/server/plugins/inputs/quit.ts
@@ -0,0 +1,31 @@
+import _ from "lodash";
+
+import {PluginInputHandler} from "./index";
+import ClientCertificate from "../clientCertificate";
+
+const commands = ["quit"];
+const allowDisconnected = true;
+
+const input: PluginInputHandler = function (network, chan, cmd, args) {
+	const client = this;
+
+	client.networks = _.without(client.networks, network);
+	network.destroy();
+	client.save();
+	client.emit("quit", {
+		network: network.uuid,
+	});
+
+	const quitMessage = args[0] ? args.join(" ") : undefined;
+	network.quit(quitMessage);
+
+	ClientCertificate.remove(network.uuid);
+
+	return true;
+};
+
+export default {
+	commands,
+	input,
+	allowDisconnected,
+};
diff --git a/server/plugins/inputs/raw.ts b/server/plugins/inputs/raw.ts
new file mode 100644
index 00000000..b682255c
--- /dev/null
+++ b/server/plugins/inputs/raw.ts
@@ -0,0 +1,16 @@
+import {PluginInputHandler} from "./index";
+
+const commands = ["raw", "send", "quote"];
+
+const input: PluginInputHandler = function ({irc}, chan, cmd, args) {
+	if (args.length !== 0) {
+		irc.connection.write(args.join(" "));
+	}
+
+	return true;
+};
+
+export default {
+	commands,
+	input,
+};
diff --git a/server/plugins/inputs/rejoin.ts b/server/plugins/inputs/rejoin.ts
new file mode 100644
index 00000000..866ce3d0
--- /dev/null
+++ b/server/plugins/inputs/rejoin.ts
@@ -0,0 +1,29 @@
+import {PluginInputHandler} from "./index";
+
+import Msg, {MessageType} from "../../models/msg";
+import {ChanType} from "../../models/chan";
+
+const commands = ["cycle", "rejoin"];
+
+const input: PluginInputHandler = function ({irc}, chan) {
+	if (chan.type !== ChanType.CHANNEL) {
+		chan.pushMessage(
+			this,
+			new Msg({
+				type: MessageType.ERROR,
+				text: "You can only rejoin channels.",
+			})
+		);
+		return;
+	}
+
+	irc.part(chan.name, "Rejoining");
+	irc.join(chan.name);
+
+	return true;
+};
+
+export default {
+	commands,
+	input,
+};
diff --git a/server/plugins/inputs/topic.ts b/server/plugins/inputs/topic.ts
new file mode 100644
index 00000000..843c64b1
--- /dev/null
+++ b/server/plugins/inputs/topic.ts
@@ -0,0 +1,28 @@
+import {PluginInputHandler} from "./index";
+
+import Msg, {MessageType} from "../../models/msg";
+import {ChanType} from "../../models/chan";
+
+const commands = ["topic"];
+
+const input: PluginInputHandler = function ({irc}, chan, cmd, args) {
+	if (chan.type !== ChanType.CHANNEL) {
+		chan.pushMessage(
+			this,
+			new Msg({
+				type: MessageType.ERROR,
+				text: `${cmd} command can only be used in channels.`,
+			})
+		);
+
+		return;
+	}
+
+	irc.setTopic(chan.name, args.join(" "));
+	return true;
+};
+
+export default {
+	commands,
+	input,
+};
diff --git a/src/plugins/inputs/whois.js b/server/plugins/inputs/whois.ts
similarity index 64%
rename from src/plugins/inputs/whois.js
rename to server/plugins/inputs/whois.ts
index 480a72dc..e4ed953d 100644
--- a/src/plugins/inputs/whois.js
+++ b/server/plugins/inputs/whois.ts
@@ -1,8 +1,8 @@
-"use strict";
+import {PluginInputHandler} from "./index";
 
-exports.commands = ["whois"];
+const commands = ["whois"];
 
-exports.input = function ({irc}, chan, cmd, args) {
+const input: PluginInputHandler = function ({irc}, chan, cmd, args) {
 	if (args.length === 1) {
 		// This queries server of the other user and not of the current user, which
 		// does not know idle time.
@@ -13,3 +13,8 @@ exports.input = function ({irc}, chan, cmd, args) {
 		irc.raw(`${cmd} ${args.join(" ")}`);
 	}
 };
+
+export default {
+	commands,
+	input,
+};
diff --git a/src/plugins/irc-events/away.js b/server/plugins/irc-events/away.ts
similarity index 69%
rename from src/plugins/irc-events/away.js
rename to server/plugins/irc-events/away.ts
index a21a463b..5709101d 100644
--- a/src/plugins/irc-events/away.js
+++ b/server/plugins/irc-events/away.ts
@@ -1,15 +1,14 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
+import {ChanType} from "../../models/chan";
+import Msg, {MessageType} from "../../models/msg";
 
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
-
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
-	irc.on("away", (data) => handleAway(Msg.Type.AWAY, data));
-	irc.on("back", (data) => handleAway(Msg.Type.BACK, data));
+	irc.on("away", (data) => handleAway(MessageType.AWAY, data));
+	irc.on("back", (data) => handleAway(MessageType.BACK, data));
 
-	function handleAway(type, data) {
+	function handleAway(type: MessageType, data) {
 		const away = data.message;
 
 		if (data.self) {
@@ -29,7 +28,7 @@ module.exports = function (irc, network) {
 			let user;
 
 			switch (chan.type) {
-				case Chan.Type.QUERY: {
+				case ChanType.QUERY: {
 					if (data.nick.toLowerCase() !== chan.name.toLowerCase()) {
 						return;
 					}
@@ -56,7 +55,7 @@ module.exports = function (irc, network) {
 					break;
 				}
 
-				case Chan.Type.CHANNEL: {
+				case ChanType.CHANNEL: {
 					user = chan.findUser(data.nick);
 
 					if (!user || user.away === away) {
diff --git a/src/plugins/irc-events/cap.js b/server/plugins/irc-events/cap.ts
similarity index 88%
rename from src/plugins/irc-events/cap.js
rename to server/plugins/irc-events/cap.ts
index 18e78cf7..d98dedce 100644
--- a/src/plugins/irc-events/cap.js
+++ b/server/plugins/irc-events/cap.ts
@@ -1,9 +1,9 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
-const STSPolicies = require("../sts");
+import Msg from "../../models/msg";
+import STSPolicies from "../sts";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("cap ls", (data) => {
@@ -20,7 +20,7 @@ module.exports = function (irc, network) {
 		}
 
 		const isSecure = irc.connection.transport.socket.encrypted;
-		const values = {};
+		const values = {} as any;
 
 		data.capabilities.sts.split(",").map((value) => {
 			value = value.split("=", 2);
diff --git a/src/plugins/irc-events/chghost.js b/server/plugins/irc-events/chghost.ts
similarity index 77%
rename from src/plugins/irc-events/chghost.js
rename to server/plugins/irc-events/chghost.ts
index 492cdf55..04bea483 100644
--- a/src/plugins/irc-events/chghost.js
+++ b/server/plugins/irc-events/chghost.ts
@@ -1,8 +1,8 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	// If server supports CHGHOST cap, then changing the hostname does not require
@@ -17,7 +17,7 @@ module.exports = function (irc, network) {
 
 			const msg = new Msg({
 				time: data.time,
-				type: Msg.Type.CHGHOST,
+				type: MessageType.CHGHOST,
 				new_ident: data.ident !== data.new_ident ? data.new_ident : "",
 				new_host: data.hostname !== data.new_hostname ? data.new_hostname : "",
 				self: data.nick === irc.user.nick,
diff --git a/src/plugins/irc-events/connection.js b/server/plugins/irc-events/connection.ts
similarity index 82%
rename from src/plugins/irc-events/connection.js
rename to server/plugins/irc-events/connection.ts
index 608c6063..dcb3be77 100644
--- a/src/plugins/irc-events/connection.js
+++ b/server/plugins/irc-events/connection.ts
@@ -1,13 +1,14 @@
-"use strict";
+/* eslint-disable @typescript-eslint/restrict-plus-operands */
+import _ from "lodash";
+import {IrcEventHandler} from "../../client";
 
-const _ = require("lodash");
-const log = require("../../log");
-const Msg = require("../../models/msg");
-const Chan = require("../../models/chan");
-const Helper = require("../../helper");
-const Config = require("../../config");
+import log from "../../log";
+import Msg, {MessageType} from "../../models/msg";
+import Helper from "../../helper";
+import Config from "../../config";
+import {ChanType, ChanState} from "../../models/chan";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	network.channels[0].pushMessage(
@@ -52,7 +53,7 @@ module.exports = function (irc, network) {
 		}
 
 		network.channels.forEach((chan) => {
-			if (chan.type !== Chan.Type.CHANNEL) {
+			if (chan.type !== ChanType.CHANNEL) {
 				return;
 			}
 
@@ -95,7 +96,7 @@ module.exports = function (irc, network) {
 		let ident = client.name || network.username;
 
 		if (Config.values.useHexIp) {
-			ident = Helper.ip2hex(client.config.browser.ip);
+			ident = Helper.ip2hex(client.config.browser!.ip!);
 		}
 
 		identSocketId = client.manager.identHandler.addSocket(socket, ident);
@@ -109,15 +110,15 @@ module.exports = function (irc, network) {
 
 		network.channels.forEach((chan) => {
 			chan.users = new Map();
-			chan.state = Chan.State.PARTED;
+			chan.state = ChanState.PARTED;
 		});
 
 		if (error) {
 			network.channels[0].pushMessage(
 				client,
 				new Msg({
-					type: Msg.Type.ERROR,
-					text: `Connection closed unexpectedly: ${error}`,
+					type: MessageType.ERROR,
+					text: `Connection closed unexpectedly: ${String(error)}`,
 				}),
 				true
 			);
@@ -154,7 +155,7 @@ module.exports = function (irc, network) {
 				client,
 				new Msg({
 					self: !message.from_server,
-					type: Msg.Type.RAW,
+					type: MessageType.RAW,
 					text: message.line,
 				}),
 				true
@@ -166,7 +167,7 @@ module.exports = function (irc, network) {
 		network.channels[0].pushMessage(
 			client,
 			new Msg({
-				type: Msg.Type.ERROR,
+				type: MessageType.ERROR,
 				text: "Socket error: " + err,
 			}),
 			true
@@ -179,7 +180,7 @@ module.exports = function (irc, network) {
 			new Msg({
 				text: `Disconnected from the network. Reconnecting in ${Math.round(
 					data.wait / 1000
-				)} seconds… (Attempt ${data.attempt})`,
+				)} seconds… (Attempt ${Number(data.attempt)})`,
 			}),
 			true
 		);
@@ -212,8 +213,11 @@ module.exports = function (irc, network) {
 
 	function sendStatus() {
 		const status = network.getNetworkStatus();
-		status.network = network.uuid;
+		const toSend = {
+			...status,
+			network: network.uuid,
+		};
 
-		client.emit("network:status", status);
+		client.emit("network:status", toSend);
 	}
 };
diff --git a/src/plugins/irc-events/ctcp.js b/server/plugins/irc-events/ctcp.ts
similarity index 79%
rename from src/plugins/irc-events/ctcp.js
rename to server/plugins/irc-events/ctcp.ts
index 70a46de8..2e6e3508 100644
--- a/src/plugins/irc-events/ctcp.js
+++ b/server/plugins/irc-events/ctcp.ts
@@ -1,22 +1,21 @@
-"use strict";
-
-const _ = require("lodash");
-const Helper = require("../../helper");
-const Msg = require("../../models/msg");
-const User = require("../../models/user");
-const pkg = require("../../../package.json");
+import _ from "lodash";
+import {IrcEventHandler} from "../../client";
+import Helper from "../../helper";
+import Msg, {MessageType} from "../../models/msg";
+import User from "../../models/user";
+import pkg from "../../../package.json";
 
 const ctcpResponses = {
 	CLIENTINFO: () =>
 		Object.getOwnPropertyNames(ctcpResponses)
 			.filter((key) => key !== "CLIENTINFO" && typeof ctcpResponses[key] === "function")
 			.join(" "),
-	PING: ({message}) => message.substring(5),
+	PING: ({message}: {message: string}) => message.substring(5),
 	SOURCE: () => pkg.repository.url,
 	VERSION: () => pkg.name + " " + Helper.getVersion() + " -- " + pkg.homepage,
 };
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 	const lobby = network.channels[0];
 
@@ -36,7 +35,7 @@ module.exports = function (irc, network) {
 		}
 
 		const msg = new Msg({
-			type: Msg.Type.CTCP,
+			type: MessageType.CTCP,
 			time: data.time,
 			from: chan.getUser(data.nick),
 			ctcpMessage: data.message,
@@ -76,9 +75,10 @@ module.exports = function (irc, network) {
 
 				// Let user know someone is making a CTCP request against their nick
 				const msg = new Msg({
-					type: Msg.Type.CTCP_REQUEST,
+					type: MessageType.CTCP_REQUEST,
 					time: data.time,
 					from: new User({nick: target}),
+					// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 					hostmask: data.ident + "@" + data.hostname,
 					ctcpMessage: data.message,
 				});
diff --git a/src/plugins/irc-events/error.js b/server/plugins/irc-events/error.ts
similarity index 86%
rename from src/plugins/irc-events/error.js
rename to server/plugins/irc-events/error.ts
index 8bb49af6..58ef9ead 100644
--- a/src/plugins/irc-events/error.js
+++ b/server/plugins/irc-events/error.ts
@@ -1,14 +1,14 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
-const Config = require("../../config");
+import Msg, {MessageType} from "../../models/msg";
+import Config from "../../config";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("irc error", function (data) {
 		const msg = new Msg({
-			type: Msg.Type.ERROR,
+			type: MessageType.ERROR,
 			error: data.error,
 			showInActive: true,
 			nick: data.nick,
@@ -48,7 +48,7 @@ module.exports = function (irc, network) {
 
 		const lobby = network.channels[0];
 		const msg = new Msg({
-			type: Msg.Type.ERROR,
+			type: MessageType.ERROR,
 			text: message,
 			showInActive: true,
 		});
@@ -56,6 +56,8 @@ module.exports = function (irc, network) {
 
 		if (irc.connection.registered === false) {
 			const nickLen = parseInt(network.irc.network.options.NICKLEN, 10) || 16;
+
+			// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 			const random = (data.nick || irc.user.nick) + Math.floor(Math.random() * 10);
 
 			// Safeguard nick changes up to allowed length
@@ -74,7 +76,7 @@ module.exports = function (irc, network) {
 	irc.on("nick invalid", function (data) {
 		const lobby = network.channels[0];
 		const msg = new Msg({
-			type: Msg.Type.ERROR,
+			type: MessageType.ERROR,
 			text: data.nick + ": " + (data.reason || "Nickname is invalid."),
 			showInActive: true,
 		});
diff --git a/src/plugins/irc-events/help.js b/server/plugins/irc-events/help.ts
similarity index 55%
rename from src/plugins/irc-events/help.js
rename to server/plugins/irc-events/help.ts
index ccf57fe4..2f0b790c 100644
--- a/src/plugins/irc-events/help.js
+++ b/server/plugins/irc-events/help.ts
@@ -1,8 +1,7 @@
-"use strict";
+import Msg, {MessageType} from "../../models/msg";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
-
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("help", function (data) {
@@ -10,7 +9,7 @@ module.exports = function (irc, network) {
 
 		if (data.help) {
 			const msg = new Msg({
-				type: Msg.Type.MONOSPACE_BLOCK,
+				type: MessageType.MONOSPACE_BLOCK,
 				command: "help",
 				text: data.help,
 			});
diff --git a/src/plugins/irc-events/info.js b/server/plugins/irc-events/info.ts
similarity index 55%
rename from src/plugins/irc-events/info.js
rename to server/plugins/irc-events/info.ts
index 663e6c77..9bfa47e8 100644
--- a/src/plugins/irc-events/info.js
+++ b/server/plugins/irc-events/info.ts
@@ -1,8 +1,7 @@
-"use strict";
+import Msg, {MessageType} from "../../models/msg";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
-
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("info", function (data) {
@@ -10,7 +9,7 @@ module.exports = function (irc, network) {
 
 		if (data.info) {
 			const msg = new Msg({
-				type: Msg.Type.MONOSPACE_BLOCK,
+				type: MessageType.MONOSPACE_BLOCK,
 				command: "info",
 				text: data.info,
 			});
diff --git a/src/plugins/irc-events/invite.js b/server/plugins/irc-events/invite.ts
similarity index 72%
rename from src/plugins/irc-events/invite.js
rename to server/plugins/irc-events/invite.ts
index 2d0ffc45..64e04793 100644
--- a/src/plugins/irc-events/invite.js
+++ b/server/plugins/irc-events/invite.ts
@@ -1,8 +1,8 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("invite", function (data) {
@@ -15,7 +15,7 @@ module.exports = function (irc, network) {
 		const invitedYou = data.invited === irc.user.nick;
 
 		const msg = new Msg({
-			type: Msg.Type.INVITE,
+			type: MessageType.INVITE,
 			time: data.time,
 			from: chan.getUser(data.nick),
 			target: chan.getUser(data.invited),
diff --git a/src/plugins/irc-events/join.js b/server/plugins/irc-events/join.ts
similarity index 74%
rename from src/plugins/irc-events/join.js
rename to server/plugins/irc-events/join.ts
index 741df63a..0c758f12 100644
--- a/src/plugins/irc-events/join.js
+++ b/server/plugins/irc-events/join.ts
@@ -1,10 +1,9 @@
-"use strict";
+import Msg, {MessageType} from "../../models/msg";
+import User from "../../models/user";
+import type {IrcEventHandler} from "../../client";
+import {ChanState} from "../../models/chan";
 
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
-const User = require("../../models/user");
-
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("join", function (data) {
@@ -13,7 +12,7 @@ module.exports = function (irc, network) {
 		if (typeof chan === "undefined") {
 			chan = client.createChannel({
 				name: data.channel,
-				state: Chan.State.JOINED,
+				state: ChanState.JOINED,
 			});
 
 			client.emit("join", {
@@ -28,7 +27,7 @@ module.exports = function (irc, network) {
 			// Request channels' modes
 			network.irc.raw("MODE", chan.name);
 		} else if (data.nick === irc.user.nick) {
-			chan.state = Chan.State.JOINED;
+			chan.state = ChanState.JOINED;
 
 			client.emit("channel:state", {
 				chan: chan.id,
@@ -43,7 +42,7 @@ module.exports = function (irc, network) {
 			hostmask: data.ident + "@" + data.hostname,
 			gecos: data.gecos,
 			account: data.account,
-			type: Msg.Type.JOIN,
+			type: MessageType.JOIN,
 			self: data.nick === irc.user.nick,
 		});
 		chan.pushMessage(client, msg);
diff --git a/src/plugins/irc-events/kick.js b/server/plugins/irc-events/kick.ts
similarity index 54%
rename from src/plugins/irc-events/kick.js
rename to server/plugins/irc-events/kick.ts
index aeac8036..44579b63 100644
--- a/src/plugins/irc-events/kick.js
+++ b/server/plugins/irc-events/kick.ts
@@ -1,23 +1,24 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
+import {ChanState} from "../../models/chan";
 
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
+import User from "../../models/user";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("kick", function (data) {
-		const chan = network.getChannel(data.channel);
+		const chan = network.getChannel(data.channel!);
 
 		if (typeof chan === "undefined") {
 			return;
 		}
 
 		const msg = new Msg({
-			type: Msg.Type.KICK,
+			type: MessageType.KICK,
 			time: data.time,
 			from: chan.getUser(data.nick),
-			target: chan.getUser(data.kicked),
+			target: chan.getUser(data.kicked!),
 			text: data.message || "",
 			highlight: data.kicked === irc.user.nick,
 			self: data.nick === irc.user.nick,
@@ -26,14 +27,14 @@ module.exports = function (irc, network) {
 
 		if (data.kicked === irc.user.nick) {
 			chan.users = new Map();
-			chan.state = Chan.State.PARTED;
+			chan.state = ChanState.PARTED;
 
 			client.emit("channel:state", {
 				chan: chan.id,
 				state: chan.state,
 			});
 		} else {
-			chan.removeUser(msg.target);
+			chan.removeUser(msg.target as User);
 		}
 	});
 };
diff --git a/src/plugins/irc-events/link.js b/server/plugins/irc-events/link.ts
similarity index 79%
rename from src/plugins/irc-events/link.js
rename to server/plugins/irc-events/link.ts
index 6bfa366b..e9ae49c4 100644
--- a/src/plugins/irc-events/link.js
+++ b/server/plugins/irc-events/link.ts
@@ -1,27 +1,52 @@
-"use strict";
+import * as cheerio from "cheerio";
+import got from "got";
+import {URL} from "url";
+import mime from "mime-types";
 
-const cheerio = require("cheerio");
-const got = require("got");
-const URL = require("url").URL;
-const mime = require("mime-types");
-const Config = require("../../config");
-const {findLinksWithSchema} = require("../../../client/js/helpers/ircmessageparser/findLinks");
-const storage = require("../storage");
-const currentFetchPromises = new Map();
+import log from "../../log";
+import Config from "../../config";
+import {findLinksWithSchema} from "../../../client/js/helpers/ircmessageparser/findLinks";
+import storage from "../storage";
+import Client from "../../client";
+import Chan from "../../models/chan";
+import Msg from "../../models/msg";
+
+type FetchRequest = {
+	data: Buffer;
+	type: string;
+	size: number;
+};
+const currentFetchPromises = new Map<string, Promise<FetchRequest>>();
 const imageTypeRegex = /^image\/.+/;
 const mediaTypeRegex = /^(audio|video)\/.+/;
-const log = require("../../log");
 
-module.exports = function (client, chan, msg, cleanText) {
+export type LinkPreview = {
+	type: string;
+	head: string;
+	body: string;
+	thumb: string;
+	size: number;
+	link: string; // Send original matched link to the client
+	shown?: boolean | null;
+	error?: string;
+	message?: string;
+
+	media?: string;
+	mediaType?: string;
+	maxSize?: number;
+	thumbActualUrl?: string;
+};
+
+export default function (client: Client, chan: Chan, msg: Msg, cleanText: string) {
 	if (!Config.values.prefetch) {
 		return;
 	}
 
-	msg.previews = findLinksWithSchema(cleanText).reduce((cleanLinks, link) => {
+	msg.previews = findLinksWithSchema(cleanText).reduce((cleanLinks: LinkPreview[], link) => {
 		const url = normalizeURL(link.link);
 
 		// If the URL is invalid and cannot be normalized, don't fetch it
-		if (url === null) {
+		if (!url) {
 			return cleanLinks;
 		}
 
@@ -35,7 +60,7 @@ module.exports = function (client, chan, msg, cleanText) {
 			return cleanLinks;
 		}
 
-		const preview = {
+		const preview: LinkPreview = {
 			type: "loading",
 			head: "",
 			body: "",
@@ -49,7 +74,7 @@ module.exports = function (client, chan, msg, cleanText) {
 
 		fetch(url, {
 			accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-			language: client.config.browser.language,
+			language: client.config.browser?.language || "",
 		})
 			.then((res) => {
 				parse(msg, chan, preview, res, client);
@@ -63,10 +88,12 @@ module.exports = function (client, chan, msg, cleanText) {
 
 		return cleanLinks;
 	}, []);
-};
+}
 
-function parseHtml(preview, res, client) {
-	return new Promise((resolve) => {
+function parseHtml(preview, res, client: Client) {
+	// TODO:
+	// eslint-disable-next-line @typescript-eslint/no-misused-promises
+	return new Promise((resolve: (preview: FetchRequest | null) => void) => {
 		const $ = cheerio.load(res.data);
 
 		return parseHtmlMedia($, preview, client)
@@ -108,7 +135,7 @@ function parseHtml(preview, res, client) {
 
 				// Verify that thumbnail pic exists and is under allowed size
 				if (thumb.length) {
-					fetch(thumb, {language: client.config.browser.language})
+					fetch(thumb, {language: client.config.browser?.language || ""})
 						.then((resThumb) => {
 							if (
 								resThumb !== null &&
@@ -128,7 +155,8 @@ function parseHtml(preview, res, client) {
 	});
 }
 
-function parseHtmlMedia($, preview, client) {
+// TODO: type $
+function parseHtmlMedia($: any, preview, client: Client): Promise<FetchRequest> {
 	return new Promise((resolve, reject) => {
 		if (Config.values.disableMediaPreview) {
 			reject();
@@ -155,13 +183,21 @@ function parseHtmlMedia($, preview, client) {
 				return;
 			}
 
-			$(`meta[property="og:${type}:type"]`).each(function (i) {
+			$(`meta[property="og:${type}:type"]`).each(function (this: cheerio.Element, i: number) {
 				const mimeType = $(this).attr("content");
 
+				if (!mimeType) {
+					return;
+				}
+
 				if (mediaTypeRegex.test(mimeType)) {
 					// If we match a clean video or audio tag, parse that as a preview instead
 					let mediaUrl = $($(`meta[property="og:${type}"]`).get(i)).attr("content");
 
+					if (!mediaUrl) {
+						return;
+					}
+
 					// Make sure media is a valid url
 					mediaUrl = normalizeURL(mediaUrl, preview.link, true);
 
@@ -177,7 +213,7 @@ function parseHtmlMedia($, preview, client) {
 							type === "video"
 								? "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5"
 								: "audio/webm, audio/ogg, audio/wav, audio/*;q=0.9, application/ogg;q=0.7, video/*;q=0.6; */*;q=0.5",
-						language: client.config.browser.language,
+						language: client.config.browser?.language || "",
 					})
 						.then((resMedia) => {
 							if (resMedia === null || !mediaTypeRegex.test(resMedia.type)) {
@@ -203,8 +239,8 @@ function parseHtmlMedia($, preview, client) {
 	});
 }
 
-function parse(msg, chan, preview, res, client) {
-	let promise;
+function parse(msg: Msg, chan: Chan, preview: LinkPreview, res: FetchRequest, client: Client) {
+	let promise: Promise<FetchRequest | null> | null = null;
 
 	preview.size = res.size;
 
@@ -294,10 +330,10 @@ function parse(msg, chan, preview, res, client) {
 		return handlePreview(client, chan, msg, preview, res);
 	}
 
-	promise.then((newRes) => handlePreview(client, chan, msg, preview, newRes));
+	void promise.then((newRes) => handlePreview(client, chan, msg, preview, newRes));
 }
 
-function handlePreview(client, chan, msg, preview, res) {
+function handlePreview(client: Client, chan: Chan, msg: Msg, preview: LinkPreview, res) {
 	const thumb = preview.thumbActualUrl || "";
 	delete preview.thumbActualUrl;
 
@@ -327,7 +363,7 @@ function handlePreview(client, chan, msg, preview, res) {
 	});
 }
 
-function emitPreview(client, chan, msg, preview) {
+function emitPreview(client: Client, chan: Chan, msg: Msg, preview: LinkPreview) {
 	// If there is no title but there is preview or description, set title
 	// otherwise bail out and show no preview
 	if (!preview.head.length && preview.type === "link") {
@@ -345,7 +381,7 @@ function emitPreview(client, chan, msg, preview) {
 	});
 }
 
-function removePreview(msg, preview) {
+function removePreview(msg: Msg, preview: LinkPreview) {
 	// If a preview fails to load, remove the link from msg object
 	// So that client doesn't attempt to display an preview on page reload
 	const index = msg.previews.indexOf(preview);
@@ -355,7 +391,7 @@ function removePreview(msg, preview) {
 	}
 }
 
-function getRequestHeaders(headers) {
+function getRequestHeaders(headers: Record<string, string>) {
 	const formattedHeaders = {
 		// Certain websites like Amazon only add <meta> tags to known bots,
 		// lets pretend to be them to get the metadata
@@ -373,7 +409,7 @@ function getRequestHeaders(headers) {
 	return formattedHeaders;
 }
 
-function fetch(uri, headers) {
+function fetch(uri: string, headers: Record<string, string>) {
 	// Stringify the object otherwise the objects won't compute to the same value
 	const cacheKey = JSON.stringify([uri, headers]);
 	let promise = currentFetchPromises.get(cacheKey);
@@ -390,10 +426,10 @@ function fetch(uri, headers) {
 		);
 	}
 
-	promise = new Promise((resolve, reject) => {
+	promise = new Promise<FetchRequest>((resolve, reject) => {
 		let buffer = Buffer.from("");
 		let contentLength = 0;
-		let contentType;
+		let contentType: string | undefined;
 		let limit = Config.values.prefetchMaxImageSize * 1024;
 
 		try {
@@ -411,14 +447,14 @@ function fetch(uri, headers) {
 					contentLength = parseInt(res.headers["content-length"], 10) || 0;
 					contentType = res.headers["content-type"];
 
-					if (imageTypeRegex.test(contentType)) {
+					if (contentType && imageTypeRegex.test(contentType)) {
 						// response is an image
 						// if Content-Length header reports a size exceeding the prefetch limit, abort fetch
 						// and if file is not to be stored we don't need to download further either
 						if (contentLength > limit || !Config.values.prefetchStorage) {
 							gotStream.destroy();
 						}
-					} else if (mediaTypeRegex.test(contentType)) {
+					} else if (contentType && mediaTypeRegex.test(contentType)) {
 						// We don't need to download the file any further after we received content-type header
 						gotStream.destroy();
 					} else {
@@ -434,7 +470,10 @@ function fetch(uri, headers) {
 				})
 				.on("error", (e) => reject(e))
 				.on("data", (data) => {
-					buffer = Buffer.concat([buffer, data], buffer.length + data.length);
+					buffer = Buffer.concat(
+						[buffer, data],
+						buffer.length + (data as Array<any>).length
+					);
 
 					if (buffer.length >= limit) {
 						gotStream.destroy();
@@ -448,12 +487,12 @@ function fetch(uri, headers) {
 					const size = contentLength > buffer.length ? contentLength : buffer.length;
 
 					if (contentType) {
-						type = contentType.split(/ *; */).shift();
+						type = contentType.split(/ *; */).shift() || "";
 					}
 
 					resolve({data: buffer, type, size});
 				});
-		} catch (e) {
+		} catch (e: any) {
 			return reject(e);
 		}
 	});
@@ -467,31 +506,31 @@ function fetch(uri, headers) {
 	return promise;
 }
 
-function normalizeURL(link, baseLink, disallowHttp = false) {
+function normalizeURL(link: string, baseLink?: string, disallowHttp = false) {
 	try {
 		const url = new URL(link, baseLink);
 
 		// Only fetch http and https links
 		if (url.protocol !== "http:" && url.protocol !== "https:") {
-			return null;
+			return undefined;
 		}
 
 		if (disallowHttp && url.protocol === "http:") {
-			return null;
+			return undefined;
 		}
 
 		// Do not fetch links without hostname or ones that contain authorization
 		if (!url.hostname || url.username || url.password) {
-			return null;
+			return undefined;
 		}
 
 		// Drop hash from the url, if any
 		url.hash = "";
 
 		return url.toString();
-	} catch (e) {
+	} catch (e: any) {
 		// if an exception was thrown, the url is not valid
 	}
 
-	return null;
+	return undefined;
 }
diff --git a/src/plugins/irc-events/list.js b/server/plugins/irc-events/list.ts
similarity index 69%
rename from src/plugins/irc-events/list.js
rename to server/plugins/irc-events/list.ts
index 2e0abeca..59cf73fc 100644
--- a/src/plugins/irc-events/list.js
+++ b/server/plugins/irc-events/list.ts
@@ -1,8 +1,8 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Chan = require("../../models/chan");
+import Chan, {ChanType, SpecialChanType} from "../../models/chan";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 	const MAX_CHANS = 500;
 
@@ -24,19 +24,25 @@ module.exports = function (irc, network) {
 
 	irc.on("channel list end", function () {
 		updateListStatus(
-			network.chanCache.sort((a, b) => b.num_users - a.num_users).slice(0, MAX_CHANS)
+			network.chanCache.sort((a, b) => b.num_users! - a.num_users!).slice(0, MAX_CHANS)
 		);
 
 		network.chanCache = [];
 	});
 
-	function updateListStatus(msg) {
+	function updateListStatus(
+		msg:
+			| {
+					text: string;
+			  }
+			| Chan[]
+	) {
 		let chan = network.getChannel("Channel List");
 
 		if (typeof chan === "undefined") {
 			chan = client.createChannel({
-				type: Chan.Type.SPECIAL,
-				special: Chan.SpecialType.CHANNELLIST,
+				type: ChanType.SPECIAL,
+				special: SpecialChanType.CHANNELLIST,
 				name: "Channel List",
 				data: msg,
 			});
diff --git a/src/plugins/irc-events/message.js b/server/plugins/irc-events/message.ts
similarity index 73%
rename from src/plugins/irc-events/message.js
rename to server/plugins/irc-events/message.ts
index cd0a0661..469ecabb 100644
--- a/src/plugins/irc-events/message.js
+++ b/server/plugins/irc-events/message.ts
@@ -1,39 +1,56 @@
-"use strict";
+import Msg, {MessageType} from "../../models/msg";
+import LinkPrefetch from "./link";
+import cleanIrcMessage from "../../../client/js/helpers/ircmessageparser/cleanIrcMessage";
+import Helper from "../../helper";
+import {IrcEventHandler} from "../../client";
+import Chan, {ChanType} from "../../models/chan";
+import User from "../../models/user";
 
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
-const LinkPrefetch = require("./link");
-const cleanIrcMessage = require("../../../client/js/helpers/ircmessageparser/cleanIrcMessage");
-const Helper = require("../../helper");
 const nickRegExp = /(?:\x03[0-9]{1,2}(?:,[0-9]{1,2})?)?([\w[\]\\`^{|}-]+)/g;
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("notice", function (data) {
-		data.type = Msg.Type.NOTICE;
-		handleMessage(data);
+		data.type = MessageType.NOTICE;
+
+		type ModifiedData = typeof data & {
+			type: MessageType.NOTICE;
+		};
+
+		handleMessage(data as ModifiedData);
 	});
 
 	irc.on("action", function (data) {
-		data.type = Msg.Type.ACTION;
+		data.type = MessageType.ACTION;
 		handleMessage(data);
 	});
 
 	irc.on("privmsg", function (data) {
-		data.type = Msg.Type.MESSAGE;
+		data.type = MessageType.MESSAGE;
 		handleMessage(data);
 	});
 
 	irc.on("wallops", function (data) {
 		data.from_server = true;
-		data.type = Msg.Type.WALLOPS;
+		data.type = MessageType.WALLOPS;
 		handleMessage(data);
 	});
 
-	function handleMessage(data) {
-		let chan;
-		let from;
+	function handleMessage(data: {
+		nick: string;
+		hostname: string;
+		ident: string;
+		target: string;
+		type: MessageType;
+		time: number;
+		text?: string;
+		from_server?: boolean;
+		message: string;
+		group?: string;
+	}) {
+		let chan: Chan | undefined;
+		let from: User;
 		let highlight = false;
 		let showInActive = false;
 		const self = data.nick === irc.user.nick;
@@ -56,7 +73,7 @@ module.exports = function (irc, network) {
 			data.from_server &&
 			(!data.target ||
 				!network.getChannel(data.target) ||
-				network.getChannel(data.target).type !== Chan.Type.CHANNEL)
+				network.getChannel(data.target)?.type !== ChanType.CHANNEL)
 		) {
 			chan = network.channels[0];
 			from = chan.getUser(data.nick);
@@ -76,12 +93,12 @@ module.exports = function (irc, network) {
 
 			if (typeof chan === "undefined") {
 				// Send notices that are not targeted at us into the server window
-				if (data.type === Msg.Type.NOTICE) {
+				if (data.type === MessageType.NOTICE) {
 					showInActive = true;
 					chan = network.channels[0];
 				} else {
 					chan = client.createChannel({
-						type: Chan.Type.QUERY,
+						type: ChanType.QUERY,
 						name: target,
 					});
 
@@ -98,9 +115,9 @@ module.exports = function (irc, network) {
 			from = chan.getUser(data.nick);
 
 			// Query messages (unless self or muted) always highlight
-			if (chan.type === Chan.Type.QUERY) {
+			if (chan.type === ChanType.QUERY) {
 				highlight = !self;
-			} else if (chan.type === Chan.Type.CHANNEL) {
+			} else if (chan.type === ChanType.CHANNEL) {
 				from.lastMessage = data.time || Date.now();
 			}
 		}
@@ -108,7 +125,7 @@ module.exports = function (irc, network) {
 		// msg is constructed down here because `from` is being copied in the constructor
 		const msg = new Msg({
 			type: data.type,
-			time: data.time,
+			time: data.time as any,
 			text: data.message,
 			self: self,
 			from: from,
@@ -126,7 +143,7 @@ module.exports = function (irc, network) {
 		// Self messages in channels are never highlighted
 		// Non-self messages are highlighted as soon as the nick is detected
 		if (!msg.highlight && !msg.self) {
-			msg.highlight = network.highlightRegex.test(data.message);
+			msg.highlight = network.highlightRegex?.test(data.message);
 
 			// If we still don't have a highlight, test against custom highlights if there's any
 			if (!msg.highlight && client.highlightRegex) {
@@ -143,16 +160,17 @@ module.exports = function (irc, network) {
 			msg.statusmsgGroup = data.group;
 		}
 
-		let match;
+		let match: RegExpExecArray | null;
 
 		while ((match = nickRegExp.exec(data.message))) {
 			if (chan.findUser(match[1])) {
+				// @ts-expect-error Type 'string' is not assignable to type '{ mode: string; }'.ts(2345)
 				msg.users.push(match[1]);
 			}
 		}
 
 		// No prefetch URLs unless are simple MESSAGE or ACTION types
-		if ([Msg.Type.MESSAGE, Msg.Type.ACTION].includes(data.type)) {
+		if ([MessageType.MESSAGE, MessageType.ACTION].includes(data.type)) {
 			LinkPrefetch(client, chan, msg, cleanMessage);
 		}
 
@@ -163,10 +181,10 @@ module.exports = function (irc, network) {
 			let title = chan.name;
 			let body = cleanMessage;
 
-			if (msg.type === Msg.Type.ACTION) {
+			if (msg.type === MessageType.ACTION) {
 				// For actions, do not include colon in the message
 				body = `${data.nick} ${body}`;
-			} else if (chan.type !== Chan.Type.QUERY) {
+			} else if (chan.type !== ChanType.QUERY) {
 				// In channels, prepend sender nickname to the message
 				body = `${data.nick}: ${body}`;
 			}
@@ -174,7 +192,7 @@ module.exports = function (irc, network) {
 			// If a channel is active on any client, highlight won't increment and notification will say (0 mention)
 			if (chan.highlight > 0) {
 				title += ` (${chan.highlight} ${
-					chan.type === Chan.Type.QUERY ? "new message" : "mention"
+					chan.type === ChanType.QUERY ? "new message" : "mention"
 				}${chan.highlight > 1 ? "s" : ""})`;
 			}
 
@@ -198,7 +216,7 @@ module.exports = function (irc, network) {
 		}
 
 		// Keep track of all mentions in channels for this client
-		if (msg.highlight && chan.type === Chan.Type.CHANNEL) {
+		if (msg.highlight && chan.type === ChanType.CHANNEL) {
 			client.mentions.push({
 				chanId: chan.id,
 				msgId: msg.id,
diff --git a/src/plugins/irc-events/mode.js b/server/plugins/irc-events/mode.ts
similarity index 87%
rename from src/plugins/irc-events/mode.js
rename to server/plugins/irc-events/mode.ts
index 8046207f..ec5bf558 100644
--- a/src/plugins/irc-events/mode.js
+++ b/server/plugins/irc-events/mode.ts
@@ -1,9 +1,9 @@
-"use strict";
+import _ from "lodash";
+import {IrcEventHandler} from "../../client";
 
-const _ = require("lodash");
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	// The following saves the channel key based on channel mode instead of
@@ -33,7 +33,8 @@ module.exports = function (irc, network) {
 		});
 
 		const msg = new Msg({
-			type: Msg.Type.MODE_CHANNEL,
+			type: MessageType.MODE_CHANNEL,
+			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			text: `${data.raw_modes} ${data.raw_params.join(" ")}`,
 		});
 		targetChan.pushMessage(client, msg);
@@ -43,7 +44,7 @@ module.exports = function (irc, network) {
 		const serverChan = network.channels[0];
 
 		const msg = new Msg({
-			type: Msg.Type.MODE_USER,
+			type: MessageType.MODE_USER,
 			raw_modes: data.raw_modes,
 			self: false,
 			showInActive: true,
@@ -66,13 +67,13 @@ module.exports = function (irc, network) {
 
 		const msg = new Msg({
 			time: data.time,
-			type: Msg.Type.MODE,
+			type: MessageType.MODE,
 			from: targetChan.getUser(data.nick),
 			text: `${data.raw_modes} ${data.raw_params.join(" ")}`,
 			self: data.nick === irc.user.nick,
 		});
 
-		const users = [];
+		const users: string[] = [];
 
 		for (const param of data.raw_params) {
 			if (targetChan.findUser(param)) {
@@ -86,7 +87,7 @@ module.exports = function (irc, network) {
 
 		targetChan.pushMessage(client, msg);
 
-		let usersUpdated;
+		let usersUpdated = false;
 		const userModeSortPriority = {};
 		const supportsMultiPrefix = network.irc.network.cap.isEnabled("multi-prefix");
 
diff --git a/src/plugins/irc-events/modelist.js b/server/plugins/irc-events/modelist.ts
similarity index 66%
rename from src/plugins/irc-events/modelist.js
rename to server/plugins/irc-events/modelist.ts
index 202a2543..7de437b4 100644
--- a/src/plugins/irc-events/modelist.js
+++ b/server/plugins/irc-events/modelist.ts
@@ -1,9 +1,9 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
+import {SpecialChanType, ChanType} from "../../models/chan";
 
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("banlist", (list) => {
@@ -13,7 +13,7 @@ module.exports = function (irc, network) {
 			banned_at: ban.banned_at * 1000,
 		}));
 
-		handleList(Chan.SpecialType.BANLIST, "Ban list", list.channel, data);
+		handleList(SpecialChanType.BANLIST, "Ban list", list.channel, data);
 	});
 
 	irc.on("inviteList", (list) => {
@@ -23,14 +23,23 @@ module.exports = function (irc, network) {
 			invited_at: invite.invited_at * 1000,
 		}));
 
-		handleList(Chan.SpecialType.INVITELIST, "Invite list", list.channel, data);
+		handleList(SpecialChanType.INVITELIST, "Invite list", list.channel, data);
 	});
 
-	function handleList(type, name, channel, data) {
+	function handleList(
+		type: SpecialChanType,
+		name: string,
+		channel: string,
+		data: {
+			hostmask: string;
+			invited_by?: string;
+			inivted_at?: number;
+		}[]
+	) {
 		if (data.length === 0) {
 			const msg = new Msg({
-				time: Date.now(),
-				type: Msg.Type.ERROR,
+				time: new Date(),
+				type: MessageType.ERROR,
 				text: `${name} is empty`,
 			});
 			let chan = network.getChannel(channel);
@@ -51,7 +60,7 @@ module.exports = function (irc, network) {
 
 		if (typeof chan === "undefined") {
 			chan = client.createChannel({
-				type: Chan.Type.SPECIAL,
+				type: ChanType.SPECIAL,
 				special: type,
 				name: chanName,
 				data: data,
diff --git a/src/plugins/irc-events/motd.js b/server/plugins/irc-events/motd.ts
similarity index 61%
rename from src/plugins/irc-events/motd.js
rename to server/plugins/irc-events/motd.ts
index 13583840..2f138975 100644
--- a/src/plugins/irc-events/motd.js
+++ b/server/plugins/irc-events/motd.ts
@@ -1,8 +1,8 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("motd", function (data) {
@@ -10,7 +10,7 @@ module.exports = function (irc, network) {
 
 		if (data.motd) {
 			const msg = new Msg({
-				type: Msg.Type.MONOSPACE_BLOCK,
+				type: MessageType.MONOSPACE_BLOCK,
 				command: "motd",
 				text: data.motd,
 			});
@@ -19,7 +19,7 @@ module.exports = function (irc, network) {
 
 		if (data.error) {
 			const msg = new Msg({
-				type: Msg.Type.MONOSPACE_BLOCK,
+				type: MessageType.MONOSPACE_BLOCK,
 				command: "motd",
 				text: data.error,
 			});
diff --git a/src/plugins/irc-events/names.js b/server/plugins/irc-events/names.ts
similarity index 82%
rename from src/plugins/irc-events/names.js
rename to server/plugins/irc-events/names.ts
index 8368b281..13dff8ad 100644
--- a/src/plugins/irc-events/names.js
+++ b/server/plugins/irc-events/names.ts
@@ -1,6 +1,6 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("userlist", function (data) {
diff --git a/src/plugins/irc-events/nick.js b/server/plugins/irc-events/nick.ts
similarity index 76%
rename from src/plugins/irc-events/nick.js
rename to server/plugins/irc-events/nick.ts
index dc930c28..34e89f5a 100644
--- a/src/plugins/irc-events/nick.js
+++ b/server/plugins/irc-events/nick.ts
@@ -1,8 +1,8 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("nick", function (data) {
@@ -13,6 +13,7 @@ module.exports = function (irc, network) {
 
 			const lobby = network.channels[0];
 			const msg = new Msg({
+				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 				text: `You're now known as ${data.new_nick}`,
 			});
 			lobby.pushMessage(client, msg, true);
@@ -34,7 +35,7 @@ module.exports = function (irc, network) {
 			const msg = new Msg({
 				time: data.time,
 				from: user,
-				type: Msg.Type.NICK,
+				type: MessageType.NICK,
 				new_nick: data.new_nick,
 			});
 			chan.pushMessage(client, msg);
diff --git a/src/plugins/irc-events/part.js b/server/plugins/irc-events/part.ts
similarity index 70%
rename from src/plugins/irc-events/part.js
rename to server/plugins/irc-events/part.ts
index 25c698cf..6323ad05 100644
--- a/src/plugins/irc-events/part.js
+++ b/server/plugins/irc-events/part.ts
@@ -1,11 +1,15 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("part", function (data) {
+		if (!data.channel) {
+			return;
+		}
+
 		const chan = network.getChannel(data.channel);
 
 		if (typeof chan === "undefined") {
@@ -14,7 +18,7 @@ module.exports = function (irc, network) {
 
 		const user = chan.getUser(data.nick);
 		const msg = new Msg({
-			type: Msg.Type.PART,
+			type: MessageType.PART,
 			time: data.time,
 			text: data.message || "",
 			hostmask: data.ident + "@" + data.hostname,
diff --git a/src/plugins/irc-events/quit.js b/server/plugins/irc-events/quit.ts
similarity index 76%
rename from src/plugins/irc-events/quit.js
rename to server/plugins/irc-events/quit.ts
index 36bd336d..7fd637d7 100644
--- a/src/plugins/irc-events/quit.js
+++ b/server/plugins/irc-events/quit.ts
@@ -1,8 +1,8 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("quit", function (data) {
@@ -15,7 +15,7 @@ module.exports = function (irc, network) {
 
 			const msg = new Msg({
 				time: data.time,
-				type: Msg.Type.QUIT,
+				type: MessageType.QUIT,
 				text: data.message || "",
 				hostmask: data.ident + "@" + data.hostname,
 				from: user,
diff --git a/src/plugins/irc-events/sasl.js b/server/plugins/irc-events/sasl.ts
similarity index 57%
rename from src/plugins/irc-events/sasl.js
rename to server/plugins/irc-events/sasl.ts
index 2b429880..132d13a6 100644
--- a/src/plugins/irc-events/sasl.js
+++ b/server/plugins/irc-events/sasl.ts
@@ -1,15 +1,16 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("loggedin", (data) => {
 		const lobby = network.channels[0];
 
 		const msg = new Msg({
-			type: Msg.Type.LOGIN,
+			type: MessageType.LOGIN,
+			// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 			text: "Logged in as: " + data.account,
 		});
 		lobby.pushMessage(client, msg, true);
@@ -19,7 +20,7 @@ module.exports = function (irc, network) {
 		const lobby = network.channels[0];
 
 		const msg = new Msg({
-			type: Msg.Type.LOGOUT,
+			type: MessageType.LOGOUT,
 			text: "Logged out",
 		});
 		lobby.pushMessage(client, msg, true);
diff --git a/src/plugins/irc-events/topic.js b/server/plugins/irc-events/topic.ts
similarity index 78%
rename from src/plugins/irc-events/topic.js
rename to server/plugins/irc-events/topic.ts
index dedc53e7..c5bc6d5b 100644
--- a/src/plugins/irc-events/topic.js
+++ b/server/plugins/irc-events/topic.ts
@@ -1,8 +1,8 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("topic", function (data) {
@@ -14,7 +14,7 @@ module.exports = function (irc, network) {
 
 		const msg = new Msg({
 			time: data.time,
-			type: Msg.Type.TOPIC,
+			type: MessageType.TOPIC,
 			from: data.nick && chan.getUser(data.nick),
 			text: data.topic,
 			self: data.nick === irc.user.nick,
@@ -36,7 +36,7 @@ module.exports = function (irc, network) {
 		}
 
 		const msg = new Msg({
-			type: Msg.Type.TOPIC_SET_BY,
+			type: MessageType.TOPIC_SET_BY,
 			from: chan.getUser(data.nick),
 			when: new Date(data.when * 1000),
 			self: data.nick === irc.user.nick,
diff --git a/src/plugins/irc-events/unhandled.js b/server/plugins/irc-events/unhandled.ts
similarity index 79%
rename from src/plugins/irc-events/unhandled.js
rename to server/plugins/irc-events/unhandled.ts
index e0b4a134..da7d7634 100644
--- a/src/plugins/irc-events/unhandled.js
+++ b/server/plugins/irc-events/unhandled.ts
@@ -1,8 +1,8 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("unknown command", function (command) {
@@ -27,7 +27,7 @@ module.exports = function (irc, network) {
 		target.pushMessage(
 			client,
 			new Msg({
-				type: Msg.Type.UNHANDLED,
+				type: MessageType.UNHANDLED,
 				command: command.command,
 				params: command.params,
 			}),
diff --git a/src/plugins/irc-events/welcome.js b/server/plugins/irc-events/welcome.ts
similarity index 71%
rename from src/plugins/irc-events/welcome.js
rename to server/plugins/irc-events/welcome.ts
index 21d8a70f..279fe4cf 100644
--- a/src/plugins/irc-events/welcome.js
+++ b/server/plugins/irc-events/welcome.ts
@@ -1,8 +1,8 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
 
-const Msg = require("../../models/msg");
+import Msg from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("registered", function (data) {
diff --git a/src/plugins/irc-events/whois.js b/server/plugins/irc-events/whois.ts
similarity index 75%
rename from src/plugins/irc-events/whois.js
rename to server/plugins/irc-events/whois.ts
index c0ceef77..9c62e7fb 100644
--- a/src/plugins/irc-events/whois.js
+++ b/server/plugins/irc-events/whois.ts
@@ -1,9 +1,9 @@
-"use strict";
+import {IrcEventHandler} from "../../client";
+import {ChanType} from "../../models/chan";
 
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
+import Msg, {MessageType} from "../../models/msg";
 
-module.exports = function (irc, network) {
+export default <IrcEventHandler>function (irc, network) {
 	const client = this;
 
 	irc.on("whois", handleWhois);
@@ -23,7 +23,7 @@ module.exports = function (irc, network) {
 				chan = network.channels[0];
 			} else {
 				chan = client.createChannel({
-					type: Chan.Type.QUERY,
+					type: ChanType.QUERY,
 					name: data.nick,
 				});
 
@@ -42,7 +42,8 @@ module.exports = function (irc, network) {
 
 		if (data.error) {
 			msg = new Msg({
-				type: Msg.Type.ERROR,
+				type: MessageType.ERROR,
+				// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 				text: "No such nick: " + data.nick,
 			});
 		} else {
@@ -51,7 +52,7 @@ module.exports = function (irc, network) {
 			// Absolute datetime in milliseconds when nick logged on.
 			data.logonTime = data.logon * 1000;
 			msg = new Msg({
-				type: Msg.Type.WHOIS,
+				type: MessageType.WHOIS,
 				whois: data,
 			});
 		}
diff --git a/src/plugins/messageStorage/sqlite.js b/server/plugins/messageStorage/sqlite.ts
similarity index 78%
rename from src/plugins/messageStorage/sqlite.js
rename to server/plugins/messageStorage/sqlite.ts
index 243d1ef8..f2a3b526 100644
--- a/src/plugins/messageStorage/sqlite.js
+++ b/server/plugins/messageStorage/sqlite.ts
@@ -1,16 +1,25 @@
-"use strict";
+import type {Database} from "sqlite3";
 
-const log = require("../../log");
-const path = require("path");
-const fs = require("fs");
-const Config = require("../../config");
-const Msg = require("../../models/msg");
+import log from "../../log";
+import path from "path";
+import fs from "fs";
+import Config from "../../config";
+import Msg, {Message} from "../../models/msg";
+import Client from "../../client";
+import Chan, {Channel} from "../../models/chan";
+import type {
+	SearchResponse,
+	SearchQuery,
+	SqliteMessageStorage as ISqliteMessageStorage,
+} from "./types";
+import Network from "../../models/network";
 
-let sqlite3;
+// TODO; type
+let sqlite3: any;
 
 try {
 	sqlite3 = require("sqlite3");
-} catch (e) {
+} catch (e: any) {
 	Config.values.messageStorage = Config.values.messageStorage.filter((item) => item !== "sqlite");
 
 	log.error(
@@ -28,8 +37,12 @@ const schema = [
 	"CREATE INDEX IF NOT EXISTS time ON messages (time)",
 ];
 
-class MessageStorage {
-	constructor(client) {
+class SqliteMessageStorage implements ISqliteMessageStorage {
+	client: Client;
+	isEnabled: boolean;
+	database!: Database;
+
+	constructor(client: Client) {
 		this.client = client;
 		this.isEnabled = false;
 	}
@@ -40,8 +53,8 @@ class MessageStorage {
 
 		try {
 			fs.mkdirSync(logsPath, {recursive: true});
-		} catch (e) {
-			log.error("Unable to create logs directory", e);
+		} catch (e: any) {
+			log.error("Unable to create logs directory", String(e));
 
 			return;
 		}
@@ -56,7 +69,7 @@ class MessageStorage {
 				"SELECT value FROM options WHERE name = 'schema_version'",
 				(err, row) => {
 					if (err) {
-						return log.error(`Failed to retrieve schema version: ${err}`);
+						return log.error(`Failed to retrieve schema version: ${err.toString()}`);
 					}
 
 					// New table
@@ -98,7 +111,7 @@ class MessageStorage {
 		});
 	}
 
-	close(callback) {
+	close(callback?: (error?: Error | null) => void) {
 		if (!this.isEnabled) {
 			return;
 		}
@@ -107,7 +120,7 @@ class MessageStorage {
 
 		this.database.close((err) => {
 			if (err) {
-				log.error(`Failed to close sqlite database: ${err}`);
+				log.error(`Failed to close sqlite database: ${err.message}`);
 			}
 
 			if (callback) {
@@ -116,7 +129,7 @@ class MessageStorage {
 		});
 	}
 
-	index(network, channel, msg) {
+	index(network: Network, channel: Chan, msg: Msg) {
 		if (!this.isEnabled) {
 			return;
 		}
@@ -144,7 +157,7 @@ class MessageStorage {
 		);
 	}
 
-	deleteChannel(network, channel) {
+	deleteChannel(network: Network, channel: Channel) {
 		if (!this.isEnabled) {
 			return;
 		}
@@ -164,7 +177,7 @@ class MessageStorage {
 	 * @param Network network - Network object where the channel is
 	 * @param Chan channel - Channel object for which to load messages for
 	 */
-	getMessages(network, channel) {
+	getMessages(network: Network, channel: Channel) {
 		if (!this.isEnabled || Config.values.maxHistory === 0) {
 			return Promise.resolve([]);
 		}
@@ -197,11 +210,12 @@ class MessageStorage {
 					}
 				)
 			);
-		});
+		}) as Promise<Message[]>;
 	}
 
-	search(query) {
+	search(query: SearchQuery): Promise<SearchResponse | []> {
 		if (!this.isEnabled) {
+			// this should never be hit as messageProvider is checked in client.search()
 			return Promise.resolve([]);
 		}
 
@@ -225,21 +239,21 @@ class MessageStorage {
 		const maxResults = 100;
 
 		select += " ORDER BY time DESC LIMIT ? OFFSET ? ";
-		params.push(maxResults);
-		query.offset = parseInt(query.offset, 10) || 0;
-		params.push(query.offset);
+		params.push(maxResults.toString());
+		query.offset = parseInt(query.offset as string, 10) || 0;
+		params.push(String(query.offset));
 
 		return new Promise((resolve, reject) => {
 			this.database.all(select, params, (err, rows) => {
 				if (err) {
 					reject(err);
 				} else {
-					const response = {
+					const response: SearchResponse = {
 						searchTerm: query.searchTerm,
 						target: query.channelName,
 						networkUuid: query.networkUuid,
-						offset: query.offset,
-						results: parseSearchRowsToMessages(query.offset, rows).reverse(),
+						offset: query.offset as number,
+						results: parseSearchRowsToMessages(query.offset as number, rows).reverse(),
 					};
 					resolve(response);
 				}
@@ -252,10 +266,11 @@ class MessageStorage {
 	}
 }
 
-module.exports = MessageStorage;
+export default SqliteMessageStorage;
 
-function parseSearchRowsToMessages(id, rows) {
-	const messages = [];
+// TODO: type any
+function parseSearchRowsToMessages(id: number, rows: any[]) {
+	const messages: Msg[] = [];
 
 	for (const row of rows) {
 		const msg = JSON.parse(row.msg);
diff --git a/src/plugins/messageStorage/text.js b/server/plugins/messageStorage/text.ts
similarity index 73%
rename from src/plugins/messageStorage/text.js
rename to server/plugins/messageStorage/text.ts
index 602aeeca..fbd2abc3 100644
--- a/src/plugins/messageStorage/text.js
+++ b/server/plugins/messageStorage/text.ts
@@ -1,14 +1,21 @@
-"use strict";
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+import fs from "fs";
+import path from "path";
+import filenamify from "filenamify";
 
-const log = require("../../log");
-const fs = require("fs");
-const path = require("path");
-const filenamify = require("filenamify");
-const Config = require("../../config");
-const Msg = require("../../models/msg");
+import log from "../../log";
+import Config from "../../config";
+import {MessageStorage} from "./types";
+import Client from "../../client";
+import Channel from "../../models/chan";
+import {Message, MessageType} from "../../models/msg";
+import Network from "../../models/network";
 
-class TextFileMessageStorage {
-	constructor(client) {
+class TextFileMessageStorage implements MessageStorage {
+	client: Client;
+	isEnabled: boolean;
+
+	constructor(client: Client) {
 		this.client = client;
 		this.isEnabled = false;
 	}
@@ -17,7 +24,7 @@ class TextFileMessageStorage {
 		this.isEnabled = true;
 	}
 
-	close(callback) {
+	close(callback: () => void) {
 		this.isEnabled = false;
 
 		if (callback) {
@@ -25,7 +32,7 @@ class TextFileMessageStorage {
 		}
 	}
 
-	index(network, channel, msg) {
+	index(network: Network, channel: Channel, msg: Message) {
 		if (!this.isEnabled) {
 			return;
 		}
@@ -38,8 +45,8 @@ class TextFileMessageStorage {
 
 		try {
 			fs.mkdirSync(logPath, {recursive: true});
-		} catch (e) {
-			log.error("Unable to create logs directory", e);
+		} catch (e: any) {
+			log.error("Unable to create logs directory", String(e));
 			return;
 		}
 
@@ -47,47 +54,47 @@ class TextFileMessageStorage {
 
 		// message types from src/models/msg.js
 		switch (msg.type) {
-			case Msg.Type.ACTION:
+			case MessageType.ACTION:
 				// [2014-01-01 00:00:00] * @Arnold is eating cookies
 				line += `* ${msg.from.mode}${msg.from.nick} ${msg.text}`;
 				break;
-			case Msg.Type.JOIN:
+			case MessageType.JOIN:
 				// [2014-01-01 00:00:00] *** Arnold (~arnold@foo.bar) joined
 				line += `*** ${msg.from.nick} (${msg.hostmask}) joined`;
 				break;
-			case Msg.Type.KICK:
+			case MessageType.KICK:
 				// [2014-01-01 00:00:00] *** Arnold was kicked by Bernie (Don't steal my cookies!)
 				line += `*** ${msg.target.nick} was kicked by ${msg.from.nick} (${msg.text})`;
 				break;
-			case Msg.Type.MESSAGE:
+			case MessageType.MESSAGE:
 				// [2014-01-01 00:00:00] <@Arnold> Put that cookie down.. Now!!
 				line += `<${msg.from.mode}${msg.from.nick}> ${msg.text}`;
 				break;
-			case Msg.Type.MODE:
+			case MessageType.MODE:
 				// [2014-01-01 00:00:00] *** Arnold set mode +o Bernie
 				line += `*** ${msg.from.nick} set mode ${msg.text}`;
 				break;
-			case Msg.Type.NICK:
+			case MessageType.NICK:
 				// [2014-01-01 00:00:00] *** Arnold changed nick to Bernie
 				line += `*** ${msg.from.nick} changed nick to ${msg.new_nick}`;
 				break;
-			case Msg.Type.NOTICE:
+			case MessageType.NOTICE:
 				// [2014-01-01 00:00:00] -Arnold- pssst, I have cookies!
 				line += `-${msg.from.nick}- ${msg.text}`;
 				break;
-			case Msg.Type.PART:
+			case MessageType.PART:
 				// [2014-01-01 00:00:00] *** Arnold (~arnold@foo.bar) left (Bye all!)
 				line += `*** ${msg.from.nick} (${msg.hostmask}) left (${msg.text})`;
 				break;
-			case Msg.Type.QUIT:
+			case MessageType.QUIT:
 				// [2014-01-01 00:00:00] *** Arnold (~arnold@foo.bar) quit (Connection reset by peer)
 				line += `*** ${msg.from.nick} (${msg.hostmask}) quit (${msg.text})`;
 				break;
-			case Msg.Type.CHGHOST:
+			case MessageType.CHGHOST:
 				// [2014-01-01 00:00:00] *** Arnold changed host to: new@fancy.host
 				line += `*** ${msg.from.nick} changed host to '${msg.new_ident}@${msg.new_host}'`;
 				break;
-			case Msg.Type.TOPIC:
+			case MessageType.TOPIC:
 				// [2014-01-01 00:00:00] *** Arnold changed topic to: welcome everyone!
 				line += `*** ${msg.from.nick} changed topic to '${msg.text}'`;
 				break;
@@ -104,7 +111,7 @@ class TextFileMessageStorage {
 			line,
 			(e) => {
 				if (e) {
-					log.error("Failed to write user log", e);
+					log.error("Failed to write user log", e.message);
 				}
 			}
 		);
@@ -141,7 +148,7 @@ class TextFileMessageStorage {
 		return false;
 	}
 
-	static getNetworkFolderName(network) {
+	static getNetworkFolderName(network: Network) {
 		// Limit network name in the folder name to 23 characters
 		// So we can still fit 12 characters of the uuid for de-duplication
 		const networkName = cleanFilename(network.name.substring(0, 23).replace(/ /g, "-"));
@@ -149,14 +156,14 @@ class TextFileMessageStorage {
 		return `${networkName}-${network.uuid.substring(networkName.length + 1)}`;
 	}
 
-	static getChannelFileName(channel) {
+	static getChannelFileName(channel: Channel) {
 		return `${cleanFilename(channel.name)}.log`;
 	}
 }
 
-module.exports = TextFileMessageStorage;
+export default TextFileMessageStorage;
 
-function cleanFilename(name) {
+function cleanFilename(name: string) {
 	name = filenamify(name, {replacement: "_"});
 	name = name.toLowerCase();
 
diff --git a/server/plugins/messageStorage/types.d.ts b/server/plugins/messageStorage/types.d.ts
new file mode 100644
index 00000000..6dfa20db
--- /dev/null
+++ b/server/plugins/messageStorage/types.d.ts
@@ -0,0 +1,45 @@
+import type {Database} from "sqlite3";
+
+import {Channel} from "../../models/channel";
+import {Message} from "../../models/message";
+import {Network} from "../../models/network";
+import Client from "../../client";
+
+interface MessageStorage {
+	client: Client;
+	isEnabled: boolean;
+
+	enable(): void;
+
+	close(callback?: () => void): void;
+
+	index(network: Network, channel: Channel, msg: Message): void;
+
+	deleteChannel(network: Network, channel: Channel);
+
+	getMessages(network: Network, channel: Channel): Promise<Message[]>;
+
+	canProvideMessages(): boolean;
+}
+
+export type SearchQuery = {
+	searchTerm: string;
+	networkUuid: string;
+	channelName: string;
+	offset: number | string;
+};
+
+export type SearchResponse =
+	| (Omit<SearchQuery, "channelName" | "offset"> & {
+			results: Message[];
+			target: string;
+			offset: number;
+	  })
+	| [];
+
+type SearchFunction = (query: SearchQuery) => Promise<SearchResponse>;
+
+export interface SqliteMessageStorage extends MessageStorage {
+	database: Database;
+	search: SearchFunction | [];
+}
diff --git a/src/plugins/packages/index.js b/server/plugins/packages/index.ts
similarity index 62%
rename from src/plugins/packages/index.js
rename to server/plugins/packages/index.ts
index 13d5a1be..7aa0af48 100644
--- a/src/plugins/packages/index.js
+++ b/server/plugins/packages/index.ts
@@ -1,20 +1,34 @@
-"use strict";
+import _ from "lodash";
+import log from "../../log";
+import colors from "chalk";
+import path from "path";
+import semver from "semver";
+import Helper from "../../helper";
+import Config from "../../config";
+import themes from "./themes";
+import inputs from "../inputs";
+import fs from "fs";
+import Utils from "../../command-line/utils";
+import Client from "../../client";
 
-const _ = require("lodash");
-const log = require("../../log");
-const colors = require("chalk");
-const path = require("path");
-const semver = require("semver");
-const Helper = require("../../helper");
-const Config = require("../../config");
-const themes = require("./themes");
-const packageMap = new Map();
-const inputs = require("../inputs");
-const fs = require("fs");
-const Utils = require("../../command-line/utils");
+type Package = {
+	onServerStart: (packageApis: any) => void;
+};
 
-const stylesheets = [];
-const files = [];
+const packageMap = new Map<string, Package>();
+
+export type PackageInfo = {
+	packageName: string;
+	thelounge?: {supports: string};
+	version: string;
+	type?: string;
+	files?: string[];
+	// Legacy support
+	name?: string;
+};
+
+const stylesheets: string[] = [];
+const files: string[] = [];
 
 const TIME_TO_LIVE = 15 * 60 * 1000; // 15 minutes, in milliseconds
 
@@ -24,7 +38,7 @@ const cache = {
 
 let experimentalWarningPrinted = false;
 
-module.exports = {
+export default {
 	getFiles,
 	getStylesheets,
 	getPackage,
@@ -32,33 +46,37 @@ module.exports = {
 	outdated,
 };
 
-const packageApis = function (packageInfo) {
+// TODO: verify binds worked. Used to be 'this' instead of 'packageApis'
+const packageApis = function (packageInfo: PackageInfo) {
 	return {
 		Stylesheets: {
-			addFile: addStylesheet.bind(this, packageInfo.packageName),
+			addFile: addStylesheet.bind(packageApis, packageInfo.packageName),
 		},
 		PublicFiles: {
-			add: addFile.bind(this, packageInfo.packageName),
+			add: addFile.bind(packageApis, packageInfo.packageName),
 		},
 		Commands: {
-			add: inputs.addPluginCommand.bind(this, packageInfo),
-			runAsUser: (command, targetId, client) =>
+			add: inputs.addPluginCommand.bind(packageApis, packageInfo),
+			runAsUser: (command: string, targetId: number, client: Client) =>
 				client.inputLine({target: targetId, text: command}),
 		},
 		Config: {
 			getConfig: () => Config.values,
-			getPersistentStorageDir: getPersistentStorageDir.bind(this, packageInfo.packageName),
+			getPersistentStorageDir: getPersistentStorageDir.bind(
+				packageApis,
+				packageInfo.packageName
+			),
 		},
 		Logger: {
-			error: (...args) => log.error(`[${packageInfo.packageName}]`, ...args),
-			warn: (...args) => log.warn(`[${packageInfo.packageName}]`, ...args),
-			info: (...args) => log.info(`[${packageInfo.packageName}]`, ...args),
-			debug: (...args) => log.debug(`[${packageInfo.packageName}]`, ...args),
+			error: (...args: string[]) => log.error(`[${packageInfo.packageName}]`, ...args),
+			warn: (...args: string[]) => log.warn(`[${packageInfo.packageName}]`, ...args),
+			info: (...args: string[]) => log.info(`[${packageInfo.packageName}]`, ...args),
+			debug: (...args: string[]) => log.debug(`[${packageInfo.packageName}]`, ...args),
 		},
 	};
 };
 
-function addStylesheet(packageName, filename) {
+function addStylesheet(packageName: string, filename: string) {
 	stylesheets.push(packageName + "/" + filename);
 }
 
@@ -66,7 +84,7 @@ function getStylesheets() {
 	return stylesheets;
 }
 
-function addFile(packageName, filename) {
+function addFile(packageName: string, filename: string) {
 	files.push(packageName + "/" + filename);
 }
 
@@ -74,30 +92,31 @@ function getFiles() {
 	return files.concat(stylesheets);
 }
 
-function getPackage(name) {
+function getPackage(name: string) {
 	return packageMap.get(name);
 }
 
-function getEnabledPackages(packageJson) {
+function getEnabledPackages(packageJson: string) {
 	try {
 		const json = JSON.parse(fs.readFileSync(packageJson, "utf-8"));
 		return Object.keys(json.dependencies);
-	} catch (e) {
+	} catch (e: any) {
 		log.error(`Failed to read packages/package.json: ${colors.red(e)}`);
 	}
 
 	return [];
 }
 
-function getPersistentStorageDir(packageName) {
+function getPersistentStorageDir(packageName: string) {
 	const dir = path.join(Config.getPackagesPath(), packageName);
 	fs.mkdirSync(dir, {recursive: true}); // we don't care if it already exists or not
 	return dir;
 }
 
-function loadPackage(packageName) {
-	let packageInfo;
-	let packageFile;
+function loadPackage(packageName: string) {
+	let packageInfo: PackageInfo;
+	// TODO: type
+	let packageFile: Package;
 
 	try {
 		const packagePath = Config.getPackageModulePath(packageName);
@@ -118,20 +137,27 @@ function loadPackage(packageName) {
 		}
 
 		packageFile = require(packagePath);
-	} catch (e) {
+	} catch (e: any) {
 		log.error(`Package ${colors.bold(packageName)} could not be loaded: ${colors.red(e)}`);
-		log.debug(e.stack);
+
+		if (e instanceof Error) {
+			log.debug(e.stack ? e.stack : e.message);
+		}
+
 		return;
 	}
 
 	const version = packageInfo.version;
-	packageInfo = packageInfo.thelounge;
-	packageInfo.packageName = packageName;
-	packageInfo.version = version;
+	packageInfo = {
+		...packageInfo.thelounge,
+		packageName: packageName,
+		version,
+	};
 
 	packageMap.set(packageName, packageFile);
 
 	if (packageInfo.type === "theme") {
+		// @ts-expect-error Argument of type 'PackageInfo' is not assignable to parameter of type 'ThemeModule'.
 		themes.addTheme(packageName, packageInfo);
 
 		if (packageInfo.files) {
@@ -164,7 +190,7 @@ function loadPackages() {
 	watchPackages(packageJson);
 }
 
-function watchPackages(packageJson) {
+function watchPackages(packageJson: string) {
 	fs.watch(
 		packageJson,
 		{
@@ -218,8 +244,16 @@ async function outdated(cacheTimeout = TIME_TO_LIVE) {
 		return false;
 	}
 
+	const command = argsList.shift();
+	const params = argsList;
+
+	if (!command) {
+		return;
+	}
+
 	// If we get an error from calling outdated and the code isn't 0, then there are no outdated packages
-	await Utils.executeYarnCommand(...argsList)
+	// TODO: was (...argsList), verify this works
+	await Utils.executeYarnCommand(command, ...params)
 		.then(() => updateOutdated(false))
 		.catch((code) => updateOutdated(code !== 0));
 
diff --git a/src/plugins/packages/publicClient.js b/server/plugins/packages/publicClient.ts
similarity index 68%
rename from src/plugins/packages/publicClient.js
rename to server/plugins/packages/publicClient.ts
index f6507971..109b1c4d 100644
--- a/src/plugins/packages/publicClient.js
+++ b/server/plugins/packages/publicClient.ts
@@ -1,7 +1,13 @@
-const Msg = require("../../models/msg");
+import {PackageInfo} from "./index";
+import Client from "../../client";
+import Chan from "../../models/chan";
+import Msg, {MessageType, UserInMessage} from "../../models/msg";
 
-module.exports = class PublicClient {
-	constructor(client, packageInfo) {
+export default class PublicClient {
+	private client: Client;
+	private packageInfo: PackageInfo;
+
+	constructor(client: Client, packageInfo: PackageInfo) {
 		this.client = client;
 		this.packageInfo = packageInfo;
 	}
@@ -11,7 +17,7 @@ module.exports = class PublicClient {
 	 * @param {String} command - IRC command to run, this is in the same format that a client would send to the server (eg: JOIN #test)
 	 * @param {String} targetId - The id of the channel to simulate the command coming from. Replies will go to this channel if appropriate
 	 */
-	runAsUser(command, targetId) {
+	runAsUser(command: string, targetId: string) {
 		this.client.inputLine({target: targetId, text: command});
 	}
 
@@ -19,7 +25,7 @@ module.exports = class PublicClient {
 	 *
 	 * @param {Object} attributes
 	 */
-	createChannel(attributes) {
+	createChannel(attributes: Partial<Chan>) {
 		return this.client.createChannel(attributes);
 	}
 
@@ -29,7 +35,7 @@ module.exports = class PublicClient {
 	 * @param {String} event - Name of the event, must be something the browser will recognise
 	 * @param {Object} data - Body of the event, can be anything, but will need to be properly interpreted by the client
 	 */
-	sendToBrowser(event, data) {
+	sendToBrowser(event: string, data) {
 		this.client.emit(event, data);
 	}
 
@@ -37,7 +43,7 @@ module.exports = class PublicClient {
 	 *
 	 * @param {Number} chanId
 	 */
-	getChannel(chanId) {
+	getChannel(chanId: number) {
 		return this.client.find(chanId);
 	}
 
@@ -47,16 +53,16 @@ module.exports = class PublicClient {
 	 * @param {String} text the message to send
 	 * @param {Chan} chan the channel to send the message to
 	 */
-	sendMessage(text, chan) {
+	sendMessage(text: string, chan: Chan) {
 		chan.pushMessage(
 			this.client,
 			new Msg({
-				type: Msg.Type.PLUGIN,
+				type: MessageType.PLUGIN,
 				text: text,
 				from: {
 					nick: this.packageInfo.name || this.packageInfo.packageName,
-				},
+				} as UserInMessage,
 			})
 		);
 	}
-};
+}
diff --git a/src/plugins/packages/themes.js b/server/plugins/packages/themes.ts
similarity index 55%
rename from src/plugins/packages/themes.js
rename to server/plugins/packages/themes.ts
index ba422bc3..0594786f 100644
--- a/src/plugins/packages/themes.js
+++ b/server/plugins/packages/themes.ts
@@ -1,12 +1,31 @@
-"use strict";
+import fs from "fs";
+import path from "path";
+import _ from "lodash";
 
-const fs = require("fs");
-const Config = require("../../config");
-const path = require("path");
-const _ = require("lodash");
-const themes = new Map();
+import Config from "../../config";
+import Utils from "../../command-line/utils";
 
-module.exports = {
+type Module = {
+	type?: string;
+	name?: string;
+};
+
+type ThemeModule = Module & {
+	type: "theme";
+	themeColor: string;
+	css: string;
+};
+
+export type ThemeForClient = {
+	displayName: string;
+	filename?: string;
+	name: string;
+	themeColor: string | null;
+};
+
+const themes = new Map<string, ThemeForClient>();
+
+export default {
 	addTheme,
 	getAll,
 	getByName,
@@ -14,9 +33,7 @@ module.exports = {
 };
 
 function loadLocalThemes() {
-	const builtInThemes = fs.readdirSync(
-		path.join(__dirname, "..", "..", "..", "public", "themes")
-	);
+	const builtInThemes = fs.readdirSync(Utils.getFileFromRelativeToRoot("public", "themes"));
 
 	builtInThemes
 		.filter((theme) => theme.endsWith(".css"))
@@ -24,7 +41,7 @@ function loadLocalThemes() {
 		.forEach((theme) => themes.set(theme.name, theme));
 }
 
-function addTheme(packageName, packageObject) {
+function addTheme(packageName: string, packageObject: ThemeModule) {
 	const theme = makePackageThemeObject(packageName, packageObject);
 
 	if (theme) {
@@ -33,7 +50,7 @@ function addTheme(packageName, packageObject) {
 }
 
 function getAll() {
-	const filteredThemes = [];
+	const filteredThemes: ThemeForClient[] = [];
 
 	for (const theme of themes.values()) {
 		filteredThemes.push(_.pick(theme, ["displayName", "name", "themeColor"]));
@@ -42,11 +59,11 @@ function getAll() {
 	return _.sortBy(filteredThemes, "displayName");
 }
 
-function getByName(name) {
+function getByName(name: string) {
 	return themes.get(name);
 }
 
-function makeLocalThemeObject(css) {
+function makeLocalThemeObject(css: string) {
 	const themeName = css.slice(0, -4);
 	return {
 		displayName: themeName.charAt(0).toUpperCase() + themeName.slice(1),
@@ -55,7 +72,10 @@ function makeLocalThemeObject(css) {
 	};
 }
 
-function makePackageThemeObject(moduleName, module) {
+function makePackageThemeObject(
+	moduleName: string,
+	module: ThemeModule
+): ThemeForClient | undefined {
 	if (!module || module.type !== "theme") {
 		return;
 	}
diff --git a/src/plugins/storage.js b/server/plugins/storage.ts
similarity index 80%
rename from src/plugins/storage.js
rename to server/plugins/storage.ts
index 6e9c8dd7..2422962c 100644
--- a/src/plugins/storage.js
+++ b/server/plugins/storage.ts
@@ -1,12 +1,11 @@
-"use strict";
-
-const log = require("../log");
-const fs = require("fs");
-const path = require("path");
-const crypto = require("crypto");
-const Config = require("../config");
+import log from "../log";
+import fs from "fs";
+import path from "path";
+import crypto from "crypto";
+import Config from "../config";
 
 class Storage {
+	references: Map<string, number>;
 	constructor() {
 		this.references = new Map();
 	}
@@ -21,7 +20,7 @@ class Storage {
 
 		try {
 			items = fs.readdirSync(dir);
-		} catch (e) {
+		} catch (e: any) {
 			fs.mkdirSync(dir, {recursive: true});
 			return;
 		}
@@ -48,12 +47,12 @@ class Storage {
 
 		fs.unlink(filePath, (err) => {
 			if (err) {
-				log.error("Failed to delete stored file", err);
+				log.error("Failed to delete stored file", err.message);
 			}
 		});
 	}
 
-	store(data, extension, callback) {
+	store(data, extension: string, callback: (url: string) => void) {
 		const hash = crypto.createHash("sha256").update(data).digest("hex");
 		const a = hash.substring(0, 2);
 		const b = hash.substring(2, 4);
@@ -70,14 +69,14 @@ class Storage {
 
 		fs.mkdir(folder, {recursive: true}, (mkdirErr) => {
 			if (mkdirErr) {
-				log.error("Failed to create storage folder", mkdirErr);
+				log.error("Failed to create storage folder", mkdirErr.message);
 
 				return callback("");
 			}
 
 			fs.writeFile(filePath, data, (err) => {
 				if (err) {
-					log.error("Failed to store a file", err);
+					log.error("Failed to store a file", err.message);
 
 					return callback("");
 				}
@@ -88,9 +87,9 @@ class Storage {
 	}
 }
 
-module.exports = new Storage();
+export default new Storage();
 
-function deleteFolder(dir) {
+function deleteFolder(dir: string) {
 	fs.readdirSync(dir).forEach((item) => {
 		item = path.join(dir, item);
 
diff --git a/src/plugins/sts.js b/server/plugins/sts.ts
similarity index 67%
rename from src/plugins/sts.js
rename to server/plugins/sts.ts
index 697af9ae..cbfa5b7a 100644
--- a/src/plugins/sts.js
+++ b/server/plugins/sts.ts
@@ -1,22 +1,35 @@
-"use strict";
+import _ from "lodash";
+import fs from "fs";
+import path from "path";
+import log from "../log";
+import Config from "../config";
 
-const _ = require("lodash");
-const fs = require("fs");
-const path = require("path");
-const log = require("../log");
-const Config = require("../config");
+type PolicyOption = {
+	port: number;
+	duration: number;
+	expires: number;
+	host: string;
+};
+
+type PolicyMap = Map<string, Omit<PolicyOption, "host">>;
 
 class STSPolicies {
+	stsFile: string;
+	refresh: _.DebouncedFunc<any>;
+
+	private policies: PolicyMap;
+
 	constructor() {
 		this.stsFile = path.join(Config.getHomePath(), "sts-policies.json");
 		this.policies = new Map();
+		// eslint-disable-next-line @typescript-eslint/unbound-method
 		this.refresh = _.debounce(this.saveFile, 10000, {maxWait: 60000});
 
 		if (!fs.existsSync(this.stsFile)) {
 			return;
 		}
 
-		const storedPolicies = JSON.parse(fs.readFileSync(this.stsFile, "utf-8"));
+		const storedPolicies = JSON.parse(fs.readFileSync(this.stsFile, "utf-8")) as PolicyOption[];
 		const now = Date.now();
 
 		storedPolicies.forEach((value) => {
@@ -30,7 +43,7 @@ class STSPolicies {
 		});
 	}
 
-	get(host) {
+	get(host: string) {
 		const policy = this.policies.get(host);
 
 		if (typeof policy === "undefined") {
@@ -46,7 +59,7 @@ class STSPolicies {
 		return policy;
 	}
 
-	update(host, port, duration) {
+	update(host: string, port: number, duration: number) {
 		if (duration > 0) {
 			this.policies.set(host, {
 				port: port,
@@ -60,7 +73,7 @@ class STSPolicies {
 		this.refresh();
 	}
 
-	refreshExpiration(host) {
+	refreshExpiration(host: string) {
 		const policy = this.policies.get(host);
 
 		if (typeof policy === "undefined") {
@@ -71,7 +84,7 @@ class STSPolicies {
 	}
 
 	saveFile() {
-		const policiesToStore = [];
+		const policiesToStore: PolicyOption[] = [];
 
 		this.policies.forEach((value, key) => {
 			policiesToStore.push({
@@ -86,10 +99,10 @@ class STSPolicies {
 
 		fs.writeFile(this.stsFile, file, {flag: "w+"}, (err) => {
 			if (err) {
-				log.error("Failed to update STS policies file!", err);
+				log.error("Failed to update STS policies file!", err.message);
 			}
 		});
 	}
 }
 
-module.exports = new STSPolicies();
+export default new STSPolicies();
diff --git a/src/plugins/uploader.js b/server/plugins/uploader.ts
similarity index 70%
rename from src/plugins/uploader.js
rename to server/plugins/uploader.ts
index 79f8f195..0a5e53a8 100644
--- a/src/plugins/uploader.js
+++ b/server/plugins/uploader.ts
@@ -1,16 +1,16 @@
-"use strict";
-
-const Config = require("../config");
-const busboy = require("@fastify/busboy");
-const {v4: uuidv4} = require("uuid");
-const path = require("path");
-const fs = require("fs");
-const fileType = require("file-type");
-const readChunk = require("read-chunk");
-const crypto = require("crypto");
-const isUtf8 = require("is-utf8");
-const log = require("../log");
-const contentDisposition = require("content-disposition");
+import Config from "../config";
+import busboy, {BusboyHeaders} from "@fastify/busboy";
+import {v4 as uuidv4} from "uuid";
+import path from "path";
+import fs from "fs";
+import fileType from "file-type";
+import readChunk from "read-chunk";
+import crypto from "crypto";
+import isUtf8 from "is-utf8";
+import log from "../log";
+import contentDisposition from "content-disposition";
+import type {Socket} from "socket.io";
+import {Request, Response} from "express";
 
 // Map of allowed mime types to their respecive default filenames
 // that will be rendered in browser without forcing them to be downloaded
@@ -38,7 +38,7 @@ const inlineContentDispositionTypes = {
 const uploadTokens = new Map();
 
 class Uploader {
-	constructor(socket) {
+	constructor(socket: Socket) {
 		socket.on("upload:auth", () => {
 			const token = uuidv4();
 
@@ -67,16 +67,17 @@ class Uploader {
 		});
 	}
 
-	static createTokenTimeout(token) {
+	static createTokenTimeout(this: void, token: string) {
 		return setTimeout(() => uploadTokens.delete(token), 60 * 1000);
 	}
 
-	static router(express) {
+	// TODO: type
+	static router(this: void, express: any) {
 		express.get("/uploads/:name/:slug*?", Uploader.routeGetFile);
 		express.post("/uploads/new/:token", Uploader.routeUploadFile);
 	}
 
-	static async routeGetFile(req, res) {
+	static async routeGetFile(this: void, req: Request, res: Response) {
 		const name = req.params.name;
 
 		const nameRegex = /^[0-9a-f]{16}$/;
@@ -130,13 +131,13 @@ class Uploader {
 		return res.sendFile(filePath);
 	}
 
-	static routeUploadFile(req, res) {
-		let busboyInstance;
-		let uploadUrl;
-		let randomName;
-		let destDir;
-		let destPath;
-		let streamWriter;
+	static routeUploadFile(this: void, req: Request, res: Response) {
+		let busboyInstance: NodeJS.WritableStream | busboy | null | undefined;
+		let uploadUrl: string | URL;
+		let randomName: string;
+		let destDir: fs.PathLike;
+		let destPath: fs.PathLike | null;
+		let streamWriter: fs.WriteStream | null;
 
 		const doneCallback = () => {
 			// detach the stream and drain any remaining data
@@ -155,7 +156,7 @@ class Uploader {
 			}
 		};
 
-		const abortWithError = (err) => {
+		const abortWithError = (err: any) => {
 			doneCallback();
 
 			// if we ended up erroring out, delete the output file from disk
@@ -173,12 +174,17 @@ class Uploader {
 		}
 
 		// if the request does not contain any body data, bail out
-		if (req.headers["content-length"] < 1) {
+		if (req.headers["content-length"] && parseInt(req.headers["content-length"]) < 1) {
 			return abortWithError(Error("Length Required"));
 		}
 
 		// Only allow multipart, as busboy can throw an error on unsupported types
-		if (!req.headers["content-type"].startsWith("multipart/form-data")) {
+		if (
+			!(
+				req.headers["content-type"] &&
+				req.headers["content-type"].startsWith("multipart/form-data")
+			)
+		) {
 			return abortWithError(Error("Unsupported Content Type"));
 		}
 
@@ -186,7 +192,7 @@ class Uploader {
 		// because it can throw on malformed headers
 		try {
 			busboyInstance = new busboy({
-				headers: req.headers,
+				headers: req.headers as BusboyHeaders,
 				limits: {
 					files: 1, // only allow one file per upload
 					fileSize: Uploader.getMaxFileSize(),
@@ -216,8 +222,10 @@ class Uploader {
 		// too many files on one folder
 		try {
 			fs.mkdirSync(destDir, {recursive: true});
-		} catch (err) {
-			log.err(`Error ensuring ${destDir} exists for uploads: ${err.message}`);
+		} catch (err: any) {
+			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+			log.error(`Error ensuring ${destDir} exists for uploads: ${err.message}`);
+
 			return abortWithError(err);
 		}
 
@@ -225,28 +233,44 @@ class Uploader {
 		streamWriter = fs.createWriteStream(destPath);
 		streamWriter.on("error", abortWithError);
 
-		busboyInstance.on("file", (fieldname, fileStream, filename) => {
-			uploadUrl = `${randomName}/${encodeURIComponent(filename)}`;
+		busboyInstance.on(
+			"file",
+			(
+				fieldname: any,
+				fileStream: {
+					on: (
+						arg0: string,
+						arg1: {(err: any): Response<any, Record<string, any>>; (): void}
+					) => void;
+					unpipe: (arg0: any) => void;
+					read: {bind: (arg0: any) => any};
+					pipe: (arg0: any) => void;
+				},
+				filename: string | number | boolean
+			) => {
+				uploadUrl = `${randomName}/${encodeURIComponent(filename)}`;
 
-			if (Config.values.fileUpload.baseUrl) {
-				uploadUrl = new URL(uploadUrl, Config.values.fileUpload.baseUrl).toString();
-			} else {
-				uploadUrl = `uploads/${uploadUrl}`;
+				if (Config.values.fileUpload.baseUrl) {
+					uploadUrl = new URL(uploadUrl, Config.values.fileUpload.baseUrl).toString();
+				} else {
+					uploadUrl = `uploads/${uploadUrl}`;
+				}
+
+				// if the busboy data stream errors out or goes over the file size limit
+				// abort the processing with an error
+				// @ts-expect-error Argument of type '(err: any) => Response<any, Record<string, any>>' is not assignable to parameter of type '{ (err: any): Response<any, Record<string, any>>; (): void; }'.ts(2345)
+				fileStream.on("error", abortWithError);
+				fileStream.on("limit", () => {
+					fileStream.unpipe(streamWriter);
+					fileStream.on("readable", fileStream.read.bind(fileStream));
+
+					return abortWithError(Error("File size limit reached"));
+				});
+
+				// Attempt to write the stream to file
+				fileStream.pipe(streamWriter);
 			}
-
-			// if the busboy data stream errors out or goes over the file size limit
-			// abort the processing with an error
-			fileStream.on("error", abortWithError);
-			fileStream.on("limit", () => {
-				fileStream.unpipe(streamWriter);
-				fileStream.on("readable", fileStream.read.bind(fileStream));
-
-				abortWithError(Error("File size limit reached"));
-			});
-
-			// Attempt to write the stream to file
-			fileStream.pipe(streamWriter);
-		});
+		);
 
 		busboyInstance.on("finish", () => {
 			doneCallback();
@@ -279,7 +303,7 @@ class Uploader {
 
 	// Returns null if an error occurred (e.g. file not found)
 	// Returns a string with the type otherwise
-	static async getFileType(filePath) {
+	static async getFileType(filePath: string) {
 		try {
 			const buffer = await readChunk(filePath, 0, 5120);
 
@@ -298,8 +322,9 @@ class Uploader {
 
 			// otherwise assume it's random binary data
 			return "application/octet-stream";
-		} catch (e) {
+		} catch (e: any) {
 			if (e.code !== "ENOENT") {
+				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 				log.warn(`Failed to read ${filePath}: ${e.message}`);
 			}
 		}
@@ -308,4 +333,4 @@ class Uploader {
 	}
 }
 
-module.exports = Uploader;
+export default Uploader;
diff --git a/src/plugins/webpush.js b/server/plugins/webpush.ts
similarity index 69%
rename from src/plugins/webpush.js
rename to server/plugins/webpush.ts
index 6f3fa3ef..9ca4ad35 100644
--- a/src/plugins/webpush.js
+++ b/server/plugins/webpush.ts
@@ -1,17 +1,21 @@
-"use strict";
-
-const _ = require("lodash");
-const log = require("../log");
-const fs = require("fs");
-const path = require("path");
-const WebPushAPI = require("web-push");
-const Config = require("../config");
-
+import _ from "lodash";
+import log from "../log";
+import fs from "fs";
+import path from "path";
+import WebPushAPI from "web-push";
+import Config from "../config";
+import Client from "../client";
+import * as os from "os";
 class WebPush {
+	vapidKeys?: {
+		publicKey: string;
+		privateKey: string;
+	};
+
 	constructor() {
 		const vapidPath = path.join(Config.getHomePath(), "vapid.json");
 
-		let vapidStat = undefined;
+		let vapidStat: fs.Stats | undefined = undefined;
 
 		try {
 			vapidStat = fs.statSync(vapidPath);
@@ -25,11 +29,12 @@ class WebPush {
 			if (isWorldReadable) {
 				log.warn(
 					vapidPath,
-					"is world readable. The file contains secrets. Please fix the permissions"
+					"is world readable.",
+					"The file contains secrets. Please fix the permissions."
 				);
 
-				if (require("os").platform() !== "win32") {
-					log.warn(`run \`chmod o= ${vapidPath}\` to correct it`);
+				if (os.platform() !== "win32") {
+					log.warn(`run \`chmod o= "${vapidPath}"\` to correct it.`);
 				}
 			}
 
@@ -64,7 +69,7 @@ class WebPush {
 		);
 	}
 
-	push(client, payload, onlyToOffline) {
+	push(client: Client, payload: any, onlyToOffline: boolean) {
 		_.forOwn(client.config.sessions, ({pushSubscription}, token) => {
 			if (pushSubscription) {
 				if (onlyToOffline && _.find(client.attachedClients, {token}) !== undefined) {
@@ -76,11 +81,13 @@ class WebPush {
 		});
 	}
 
-	pushSingle(client, subscription, payload) {
+	pushSingle(client: Client, subscription: WebPushAPI.PushSubscription, payload: any) {
 		WebPushAPI.sendNotification(subscription, JSON.stringify(payload)).catch((error) => {
 			if (error.statusCode >= 400 && error.statusCode < 500) {
 				log.warn(
-					`WebPush subscription for ${client.name} returned an error (${error.statusCode}), removing subscription`
+					`WebPush subscription for ${client.name} returned an error (${String(
+						error.statusCode
+					)}), removing subscription`
 				);
 
 				_.forOwn(client.config.sessions, ({pushSubscription}, token) => {
@@ -92,9 +99,9 @@ class WebPush {
 				return;
 			}
 
-			log.error(`WebPush Error (${error})`);
+			log.error(`WebPush Error (${String(error)})`);
 		});
 	}
 }
 
-module.exports = WebPush;
+export default WebPush;
diff --git a/src/server.js b/server/server.ts
similarity index 71%
rename from src/server.js
rename to server/server.ts
index 49c417a3..0eab6cbc 100644
--- a/src/server.js
+++ b/server/server.ts
@@ -1,37 +1,77 @@
-"use strict";
+import _ from "lodash";
+import {Server as wsServer} from "ws";
+import express, {NextFunction, Request, Response} from "express";
+import fs from "fs";
+import path from "path";
+import {Server, Socket} from "socket.io";
+import dns from "dns";
+import colors from "chalk";
+import net from "net";
 
-const _ = require("lodash");
-const log = require("./log");
-const pkg = require("../package.json");
-const Client = require("./client");
-const ClientManager = require("./clientManager");
-const express = require("express");
-const fs = require("fs");
-const path = require("path");
-const io = require("socket.io");
-const dns = require("dns");
-const Uploader = require("./plugins/uploader");
-const Helper = require("./helper");
-const Config = require("./config");
-const colors = require("chalk");
-const net = require("net");
-const Identification = require("./identification");
-const changelog = require("./plugins/changelog");
-const inputs = require("./plugins/inputs");
-const Auth = require("./plugins/auth");
+import log from "./log";
+import pkg from "../package.json";
+import Client from "./client";
+import ClientManager from "./clientManager";
+import Uploader from "./plugins/uploader";
+import Helper from "./helper";
+import Config, {ConfigType, Defaults} from "./config";
+import Identification from "./identification";
+import changelog from "./plugins/changelog";
+import inputs from "./plugins/inputs";
+import Auth from "./plugins/auth";
 
-const themes = require("./plugins/packages/themes");
+import themes, {ThemeForClient} from "./plugins/packages/themes";
 themes.loadLocalThemes();
 
-const packages = require("./plugins/packages/index");
-const Chan = require("./models/chan");
+import packages from "./plugins/packages/index";
+import {NetworkWithIrcFramework} from "./models/network";
+import {ChanType} from "./models/chan";
+import Utils from "./command-line/utils";
+import type {
+	ClientToServerEvents,
+	ServerToClientEvents,
+	InterServerEvents,
+	SocketData,
+} from "./types/socket-events";
+
+type ServerOptions = {
+	dev: boolean;
+};
+
+type ServerConfiguration = ConfigType & {
+	stylesheets: string[];
+};
+
+type IndexTemplateConfiguration = ServerConfiguration & {
+	cacheBust: string;
+};
+
+export type ClientConfiguration = Pick<
+	ConfigType,
+	"public" | "lockNetwork" | "useHexIp" | "prefetch" | "defaults"
+> & {
+	fileUpload: boolean;
+	ldapEnabled: boolean;
+	isUpdateAvailable: boolean;
+	applicationServerKey: string;
+	version: string;
+	gitCommit: string | null;
+	defaultTheme: string;
+	themes: ThemeForClient[];
+	defaults: Defaults;
+	fileUploadMaxFileSize?: number;
+};
 
 // A random number that will force clients to reload the page if it differs
 const serverHash = Math.floor(Date.now() * Math.random());
 
-let manager = null;
+let manager: ClientManager | null = null;
 
-module.exports = function (options = {}) {
+export default async function (
+	options: ServerOptions = {
+		dev: false,
+	}
+) {
 	log.info(`The Lounge ${colors.green(Helper.getVersion())} \
 (Node.js ${colors.green(process.versions.node)} on ${colors.green(process.platform)} ${
 		process.arch
@@ -46,7 +86,7 @@ module.exports = function (options = {}) {
 	const app = express();
 
 	if (options.dev) {
-		require("./plugins/dev-server.js")(app);
+		(await import("./plugins/dev-server")).default(app);
 	}
 
 	app.set("env", "production")
@@ -57,7 +97,7 @@ module.exports = function (options = {}) {
 		.get("/service-worker.js", forceNoCacheRequest)
 		.get("/js/bundle.js.map", forceNoCacheRequest)
 		.get("/css/style.css.map", forceNoCacheRequest)
-		.use(express.static(path.join(__dirname, "..", "public"), staticOptions))
+		.use(express.static(Utils.getFileFromRelativeToRoot("public"), staticOptions))
 		.use("/storage/", express.static(Config.getStoragePath(), staticOptions));
 
 	if (Config.values.fileUpload.enable) {
@@ -72,7 +112,7 @@ module.exports = function (options = {}) {
 		const themeName = req.params.theme;
 		const theme = themes.getByName(themeName);
 
-		if (theme === undefined) {
+		if (theme === undefined || theme.filename === undefined) {
 			return res.status(404).send("Not found");
 		}
 
@@ -92,7 +132,7 @@ module.exports = function (options = {}) {
 		return res.sendFile(path.join(packagePath, fileName));
 	});
 
-	let server = null;
+	let server: import("http").Server | import("https").Server | null = null;
 
 	if (Config.values.public && (Config.values.ldap || {}).enable) {
 		log.warn(
@@ -101,8 +141,8 @@ module.exports = function (options = {}) {
 	}
 
 	if (!Config.values.https.enable) {
-		server = require("http");
-		server = server.createServer(app);
+		const createServer = (await import("http")).createServer;
+		server = createServer(app);
 	} else {
 		const keyPath = Helper.expandHome(Config.values.https.key);
 		const certPath = Helper.expandHome(Config.values.https.certificate);
@@ -123,8 +163,8 @@ module.exports = function (options = {}) {
 			process.exit(1);
 		}
 
-		server = require("https");
-		server = server.createServer(
+		const createServer = (await import("https")).createServer;
+		server = createServer(
 			{
 				key: fs.readFileSync(keyPath),
 				cert: fs.readFileSync(certPath),
@@ -134,7 +174,12 @@ module.exports = function (options = {}) {
 		);
 	}
 
-	let listenParams;
+	let listenParams:
+		| string
+		| {
+				port: number;
+				host: string | undefined;
+		  };
 
 	if (typeof Config.values.host === "string" && Config.values.host.startsWith("unix:")) {
 		listenParams = Config.values.host.replace(/^unix:/, "");
@@ -145,6 +190,7 @@ module.exports = function (options = {}) {
 		};
 	}
 
+	// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 	server.on("error", (err) => log.error(`${err}`));
 
 	server.listen(listenParams, () => {
@@ -152,28 +198,45 @@ module.exports = function (options = {}) {
 			log.info("Available on socket " + colors.green(listenParams));
 		} else {
 			const protocol = Config.values.https.enable ? "https" : "http";
-			const address = server.address();
+			const address = server?.address();
 
-			if (address.family === "IPv6") {
-				address.address = "[" + address.address + "]";
+			if (address && typeof address !== "string") {
+				// TODO: Node may revert the Node 18 family string --> number change
+				// @ts-expect-error This condition will always return 'false' since the types 'string' and 'number' have no overlap.
+				if (address.family === "IPv6" || address.family === 6) {
+					address.address = "[" + address.address + "]";
+				}
+
+				log.info(
+					"Available at " +
+						colors.green(`${protocol}://${address.address}:${address.port}/`) +
+						` in ${colors.bold(Config.values.public ? "public" : "private")} mode`
+				);
 			}
-
-			log.info(
-				"Available at " +
-					colors.green(`${protocol}://${address.address}:${address.port}/`) +
-					` in ${colors.bold(Config.values.public ? "public" : "private")} mode`
-			);
 		}
 
-		const sockets = io(server, {
-			wsEngine: require("ws").Server,
+		// This should never happen
+		if (!server) {
+			return;
+		}
+
+		const sockets = new Server<
+			ClientToServerEvents,
+			ServerToClientEvents,
+			InterServerEvents,
+			SocketData
+		>(server, {
+			wsEngine: wsServer,
 			cookie: false,
 			serveClient: false,
-			transports: Config.values.transports,
+
+			// TODO: type as Server.Transport[]
+			transports: Config.values.transports as any,
 			pingTimeout: 60000,
 		});
 
 		sockets.on("connect", (socket) => {
+			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			socket.on("error", (err) => log.error(`io socket error: ${err}`));
 
 			if (Config.values.public) {
@@ -204,15 +267,18 @@ module.exports = function (options = {}) {
 			if (err) {
 				log.error(`Could not start identd server, ${err.message}`);
 				process.exit(1);
+			} else if (!manager) {
+				log.error("Could not start identd server, ClientManager is undefined");
+				process.exit(1);
 			}
 
 			manager.init(identHandler, sockets);
 		});
 
 		// Handle ctrl+c and kill gracefully
-		let suicideTimeout = null;
+		let suicideTimeout: NodeJS.Timeout | null = null;
 
-		const exitGracefully = function () {
+		const exitGracefully = async function () {
 			if (suicideTimeout !== null) {
 				return;
 			}
@@ -220,39 +286,52 @@ module.exports = function (options = {}) {
 			log.info("Exiting...");
 
 			// Close all client and IRC connections
-			manager.clients.forEach((client) => client.quit());
+			if (manager) {
+				manager.clients.forEach((client) => client.quit());
+			}
 
 			if (Config.values.prefetchStorage) {
 				log.info("Clearing prefetch storage folder, this might take a while...");
 
-				require("./plugins/storage").emptyDir();
+				(await import("./plugins/storage")).default.emptyDir();
 			}
 
 			// Forcefully exit after 3 seconds
 			suicideTimeout = setTimeout(() => process.exit(1), 3000);
 
 			// Close http server
-			server.close(() => {
-				clearTimeout(suicideTimeout);
+			server?.close(() => {
+				if (suicideTimeout !== null) {
+					clearTimeout(suicideTimeout);
+				}
+
 				process.exit(0);
 			});
 		};
 
+		/* eslint-disable @typescript-eslint/no-misused-promises */
 		process.on("SIGINT", exitGracefully);
 		process.on("SIGTERM", exitGracefully);
+		/* eslint-enable @typescript-eslint/no-misused-promises */
 
 		// Clear storage folder after server starts successfully
 		if (Config.values.prefetchStorage) {
-			require("./plugins/storage").emptyDir();
+			import("./plugins/storage")
+				.then(({default: storage}) => {
+					storage.emptyDir();
+				})
+				.catch((err: Error) => {
+					log.error(`Could not clear storage folder, ${err.message}`);
+				});
 		}
 
 		changelog.checkForUpdates(manager);
 	});
 
 	return server;
-};
+}
 
-function getClientLanguage(socket) {
+function getClientLanguage(socket: Socket): string | null {
 	const acceptLanguage = socket.handshake.headers["accept-language"];
 
 	if (typeof acceptLanguage === "string" && /^[\x00-\x7F]{1,50}$/.test(acceptLanguage)) {
@@ -263,11 +342,11 @@ function getClientLanguage(socket) {
 	return null;
 }
 
-function getClientIp(socket) {
+function getClientIp(socket: Socket) {
 	let ip = socket.handshake.address || "127.0.0.1";
 
 	if (Config.values.reverseProxy) {
-		const forwarded = (socket.handshake.headers["x-forwarded-for"] || "")
+		const forwarded = String(socket.handshake.headers["x-forwarded-for"])
 			.split(/\s*,\s*/)
 			.filter(Boolean);
 
@@ -279,7 +358,7 @@ function getClientIp(socket) {
 	return ip.replace(/^::ffff:/, "");
 }
 
-function getClientSecure(socket) {
+function getClientSecure(socket: Socket) {
 	let secure = socket.handshake.secure;
 
 	if (Config.values.reverseProxy && socket.handshake.headers["x-forwarded-proto"] === "https") {
@@ -289,12 +368,12 @@ function getClientSecure(socket) {
 	return secure;
 }
 
-function allRequests(req, res, next) {
+function allRequests(req: Request, res: Response, next: NextFunction) {
 	res.setHeader("X-Content-Type-Options", "nosniff");
 	return next();
 }
 
-function addSecurityHeaders(req, res, next) {
+function addSecurityHeaders(req: Request, res: Response, next: NextFunction) {
 	const policies = [
 		"default-src 'none'", // default to nothing
 		"base-uri 'none'", // disallow <base>, has no fallback to default-src
@@ -324,25 +403,25 @@ function addSecurityHeaders(req, res, next) {
 	return next();
 }
 
-function forceNoCacheRequest(req, res, next) {
+function forceNoCacheRequest(req: Request, res: Response, next: NextFunction) {
 	// Intermittent proxies must not cache the following requests,
 	// browsers must fetch the latest version of these files (service worker, source maps)
 	res.setHeader("Cache-Control", "no-cache, no-transform");
 	return next();
 }
 
-function indexRequest(req, res) {
+function indexRequest(req: Request, res: Response) {
 	res.setHeader("Content-Type", "text/html");
 
 	return fs.readFile(
-		path.join(__dirname, "..", "client", "index.html.tpl"),
+		Utils.getFileFromRelativeToRoot("client/index.html.tpl"),
 		"utf-8",
 		(err, file) => {
 			if (err) {
 				throw err;
 			}
 
-			const config = getServerConfiguration();
+			const config = getServerConfiguration() as IndexTemplateConfiguration;
 			config.cacheBust = Helper.getVersionCacheBust();
 
 			res.send(_.template(file)(config));
@@ -350,7 +429,13 @@ function indexRequest(req, res) {
 	);
 }
 
-function initializeClient(socket, client, token, lastMessage, openChannel) {
+function initializeClient(
+	socket: Socket,
+	client: Client,
+	token: string,
+	lastMessage: number,
+	openChannel: number
+) {
 	socket.off("auth:perform", performAuthentication);
 	socket.emit("auth:success");
 
@@ -428,7 +513,7 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
 			return;
 		}
 
-		network.edit(client, data);
+		(network as NetworkWithIrcFramework).edit(client, data);
 	});
 
 	socket.on("history:clear", (data) => {
@@ -465,8 +550,11 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
 
 						const hash = Helper.password.hash(p1);
 
-						client.setPassword(hash, (success) => {
-							const obj = {success: false};
+						client.setPassword(hash, (success: boolean) => {
+							const obj = {success: false, error: undefined} as {
+								success: boolean;
+								error: string | undefined;
+							};
 
 							if (success) {
 								obj.success = true;
@@ -477,8 +565,8 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
 							socket.emit("change-password", obj);
 						});
 					})
-					.catch((error) => {
-						log.error(`Error while checking users password. Error: ${error}`);
+					.catch((error: Error) => {
+						log.error(`Error while checking users password. Error: ${error.message}`);
 					});
 			}
 		});
@@ -501,12 +589,14 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
 	});
 
 	socket.on("changelog", () => {
-		Promise.all([changelog.fetch(), packages.outdated()]).then(
-			([changelogData, packageUpdate]) => {
+		Promise.all([changelog.fetch(), packages.outdated()])
+			.then(([changelogData, packageUpdate]) => {
 				changelogData.packages = packageUpdate;
 				socket.emit("changelog", changelogData);
-			}
-		);
+			})
+			.catch((error: Error) => {
+				log.error(`Error while fetching changelog. Error: ${error.message}`);
+			});
 	});
 
 	// In public mode only one client can be connected,
@@ -597,18 +687,22 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
 	}
 
 	const sendSessionList = () => {
-		const sessions = _.map(client.config.sessions, (session, sessionToken) => ({
-			current: sessionToken === token,
-			active: _.reduce(
-				client.attachedClients,
-				(count, attachedClient) => count + (attachedClient.token === sessionToken ? 1 : 0),
-				0
-			),
-			lastUse: session.lastUse,
-			ip: session.ip,
-			agent: session.agent,
-			token: sessionToken, // TODO: Ideally don't expose actual tokens to the client
-		}));
+		// TODO: this should use the ClientSession type currently in client
+		const sessions = _.map(client.config.sessions, (session, sessionToken) => {
+			return {
+				current: sessionToken === token,
+				active: _.reduce(
+					client.attachedClients,
+					(count, attachedClient) =>
+						count + (attachedClient.token === sessionToken ? 1 : 0),
+					0
+				),
+				lastUse: session.lastUse,
+				ip: session.ip,
+				agent: session.agent,
+				token: sessionToken, // TODO: Ideally don't expose actual tokens to the client
+			};
+		});
 
 		socket.emit("sessions:list", sessions);
 	};
@@ -663,30 +757,36 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
 			socket.emit("setting:all", clientSettings);
 		});
 
-		socket.on("search", (query) => {
-			client.search(query).then((results) => {
+		socket.on("search", async (query) => {
+			await client.search(query).then((results) => {
 				socket.emit("search:results", results);
 			});
 		});
 
 		socket.on("mute:change", ({target, setMutedTo}) => {
-			const {chan, network} = client.find(target);
+			const networkAndChan = client.find(target);
+
+			if (!networkAndChan) {
+				return;
+			}
+
+			const {chan, network} = networkAndChan;
 
 			// If the user mutes the lobby, we mute the entire network.
-			if (chan.type === Chan.Type.LOBBY) {
+			if (chan.type === ChanType.LOBBY) {
 				for (const channel of network.channels) {
-					if (channel.type !== Chan.Type.SPECIAL) {
+					if (channel.type !== ChanType.SPECIAL) {
 						channel.setMuteStatus(setMutedTo);
 					}
 				}
 			} else {
-				if (chan.type !== Chan.Type.SPECIAL) {
+				if (chan.type !== ChanType.SPECIAL) {
 					chan.setMuteStatus(setMutedTo);
 				}
 			}
 
 			for (const attachedClient of Object.keys(client.attachedClients)) {
-				manager.sockets.in(attachedClient).emit("mute:changed", {
+				manager!.sockets.in(attachedClient).emit("mute:changed", {
 					target,
 					status: setMutedTo,
 				});
@@ -715,10 +815,10 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
 				return;
 			}
 
-			const socketToRemove = manager.sockets.of("/").sockets.get(socketId);
+			const socketToRemove = manager!.sockets.of("/").sockets.get(socketId);
 
-			socketToRemove.emit("sign-out");
-			socketToRemove.disconnect();
+			socketToRemove!.emit("sign-out");
+			socketToRemove!.disconnect();
 		});
 
 		// Do not send updated session list if user simply logs out
@@ -727,9 +827,10 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
 		}
 	});
 
-	socket.join(client.id);
+	// socket.join is a promise depending on the adapter.
+	void socket.join(client.id?.toString());
 
-	const sendInitEvent = (tokenToSend) => {
+	const sendInitEvent = (tokenToSend: string | null) => {
 		socket.emit("init", {
 			active: openChannel,
 			networks: client.networks.map((network) =>
@@ -742,13 +843,12 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
 
 	if (Config.values.public) {
 		sendInitEvent(null);
-	} else if (token === null) {
+	} else if (!token) {
 		client.generateToken((newToken) => {
 			token = client.calculateTokenHash(newToken);
 			client.attachedClients[socket.id].token = token;
 
 			client.updateSession(token, getClientIp(socket), socket.request);
-
 			sendInitEvent(newToken);
 		});
 	} else {
@@ -757,8 +857,13 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
 	}
 }
 
-function getClientConfiguration() {
-	const config = _.pick(Config.values, ["public", "lockNetwork", "useHexIp", "prefetch"]);
+function getClientConfiguration(): ClientConfiguration {
+	const config = _.pick(Config.values, [
+		"public",
+		"lockNetwork",
+		"useHexIp",
+		"prefetch",
+	]) as ClientConfiguration;
 
 	config.fileUpload = Config.values.fileUpload.enable;
 	config.ldapEnabled = Config.values.ldap.enable;
@@ -774,11 +879,11 @@ function getClientConfiguration() {
 			"password",
 			"realname",
 			"join",
-		]);
+		]) as Defaults;
 	}
 
 	config.isUpdateAvailable = changelog.isUpdateAvailable;
-	config.applicationServerKey = manager.webPush.vapidKeys.publicKey;
+	config.applicationServerKey = manager!.webPush.vapidKeys!.publicKey;
 	config.version = pkg.version;
 	config.gitCommit = Helper.getGitCommit();
 	config.themes = themes.getAll();
@@ -795,22 +900,22 @@ function getClientConfiguration() {
 	return config;
 }
 
-function getServerConfiguration() {
-	const config = _.clone(Config.values);
+function getServerConfiguration(): ServerConfiguration {
+	const config = _.clone(Config.values) as ServerConfiguration;
 
 	config.stylesheets = packages.getStylesheets();
 
 	return config;
 }
 
-function performAuthentication(data) {
+function performAuthentication(this: Socket, data) {
 	if (!_.isPlainObject(data)) {
 		return;
 	}
 
 	const socket = this;
 	let client;
-	let token = null;
+	let token: string;
 
 	const finalInit = () =>
 		initializeClient(socket, client, token, data.lastMessage || -1, data.openChannel);
@@ -838,19 +943,19 @@ function performAuthentication(data) {
 			return finalInit();
 		}
 
-		reverseDnsLookup(client.config.browser.ip, (hostname) => {
-			client.config.browser.hostname = hostname;
+		reverseDnsLookup(client.config.browser?.ip, (hostname) => {
+			client.config.browser!.hostname = hostname;
 
 			finalInit();
 		});
 	};
 
 	if (Config.values.public) {
-		client = new Client(manager);
-		manager.clients.push(client);
+		client = new Client(manager!);
+		manager!.clients.push(client);
 
 		socket.on("disconnect", function () {
-			manager.clients = _.without(manager.clients, client);
+			manager!.clients = _.without(manager!.clients, client);
 			client.quit();
 		});
 
@@ -887,13 +992,13 @@ function performAuthentication(data) {
 		// If authorization succeeded but there is no loaded user,
 		// load it and find the user again (this happens with LDAP)
 		if (!client) {
-			client = manager.loadUser(data.user);
+			client = manager!.loadUser(data.user);
 		}
 
 		initClient();
 	};
 
-	client = manager.findClient(data.user);
+	client = manager!.findClient(data.user);
 
 	// We have found an existing user and client has provided a token
 	if (client && data.token) {
@@ -906,17 +1011,24 @@ function performAuthentication(data) {
 		}
 	}
 
-	// Perform password checking
-	Auth.auth(manager, client, data.user, data.password, authCallback);
+	Auth.initialize().then(() => {
+		// Perform password checking
+		Auth.auth(manager, client, data.user, data.password, authCallback);
+	});
 }
 
-function reverseDnsLookup(ip, callback) {
+function reverseDnsLookup(ip: string, callback: (hostname: string) => void) {
 	dns.reverse(ip, (reverseErr, hostnames) => {
 		if (reverseErr || hostnames.length < 1) {
 			return callback(ip);
 		}
 
 		dns.resolve(hostnames[0], net.isIP(ip) === 6 ? "AAAA" : "A", (resolveErr, resolvedIps) => {
+			// TODO: investigate SoaRecord class
+			if (!Array.isArray(resolvedIps)) {
+				return callback(ip);
+			}
+
 			if (resolveErr || resolvedIps.length < 1) {
 				return callback(ip);
 			}
diff --git a/server/tsconfig.json b/server/tsconfig.json
new file mode 100644
index 00000000..992c7873
--- /dev/null
+++ b/server/tsconfig.json
@@ -0,0 +1,27 @@
+{
+  "extends": "../tsconfig.base.json" /* Path to base configuration file to inherit from. Requires TypeScript version 2.1 or later. */,
+  "include": [
+    "**/*",
+    "../client/js/helpers/ircmessageparser/*.ts"
+  ] /* Specifies a list of glob patterns that match files to be included in compilation. If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. Requires TypeScript version 2.0 or later. */,
+  "files": [
+    "../client/js/constants.ts",
+    "../babel.config.cjs",
+    "../defaults/config.js",
+    "../package.json",
+    "../webpack.config.ts"
+  ] /* If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. When a 'files' property is specified, only those files and those specified by 'include' are included. */,
+  "ts-node": {
+    "files": true
+  },
+  "compilerOptions": {
+    "outDir": "../dist" /* Specify an output folder for all emitted files. See more: https://www.typescriptlang.org/tsconfig#outDir */,
+    "noEmit": false /* Disable emitting file from a compilation. See more: https://www.typescriptlang.org/tsconfig#noEmit */,
+
+    // TODO: Remove eventually
+    "noImplicitAny": false /*Enable error reporting for expressions and declarations with an implied any type. See more: https://www.typescriptlang.org/tsconfig#noImplicitAny */
+  } /* Instructs the TypeScript compiler how to compile .ts files. */,
+  "exclude": [
+    "./dist"
+  ] /* Specifies a list of glob patterns that match files to be excluded from compilation. Requires TypeScript version 2.0 or later. */
+}
diff --git a/server/types/index.d.ts b/server/types/index.d.ts
new file mode 100644
index 00000000..6ca0976a
--- /dev/null
+++ b/server/types/index.d.ts
@@ -0,0 +1,2 @@
+import "./modules";
+import "./socket-events";
diff --git a/server/types/modules/irc-framework.d.ts b/server/types/modules/irc-framework.d.ts
new file mode 100644
index 00000000..71802891
--- /dev/null
+++ b/server/types/modules/irc-framework.d.ts
@@ -0,0 +1,430 @@
+/* eslint-disable no-use-before-define */
+// @ts-nocheck
+// eslint-disable
+
+// https://raw.githubusercontent.com/eternagame/HTML-Chat/vue-rewrite/src/app/types/modules/irc-framework/irc-framework.d.ts
+// TODO: Fix this
+declare module "irc-framework" {
+	import {EventEmitter} from "eventemitter3";
+	// import { DuplexStream } from 'stream';
+	import Connection from "irc-framework/src/transports/websocket";
+
+	type ConnectionOpts = {
+		connected: boolean;
+		requested_disconnect: boolean;
+
+		reconnect_attempts: number;
+
+		// When an IRC connection was successfully registered.
+		registered: boolean;
+
+		transport: any;
+		write: (data: string) => void;
+		end: () => void;
+	};
+
+	export interface MessageEventArgs {
+		account?: any;
+		group?: any;
+		hostname: string;
+		ident: string;
+		message: string;
+		nick: string;
+		reply: (message: string) => void;
+		tags: {[key: string]: string};
+		target: string;
+		time?: any;
+		type: "privmsg" | "action" | "notice" | "wallops";
+	}
+	export interface JoinEventArgs {
+		account: boolean;
+		channel: string;
+		gecos: string;
+		hostname: string;
+		ident: string;
+		nick: string;
+		time?: any;
+	}
+	export interface KickEventArgs {
+		kicked: string;
+		nick: string;
+		ident: string;
+		hostname: string;
+		channel: string;
+		message: string;
+		time: number;
+	}
+	export interface RawEventArgs {
+		from_server: boolean;
+		line: string;
+	}
+	export interface RegisteredEventArgs {
+		nick: string;
+	}
+	export interface QuitEventArgs {
+		hostname: string;
+		ident: string;
+		message: string;
+		nick: string;
+		time?: any;
+		channel?: string;
+		kicked?: string;
+	}
+	interface Mode {
+		mode: string;
+		param: string;
+	}
+	export interface ModeEventArgs {
+		modes: Mode[];
+		nick: string;
+		raw_modes: string;
+		raw_params: string[];
+		target: string;
+		time?: any;
+	}
+	export interface ServerOptionsEventArgs {
+		options: any;
+		cap: any;
+	}
+	export interface NickInvalidEventArgs {
+		nick: string;
+		reason: string;
+	}
+	export interface NickInUseEventArgs {
+		nick: string;
+		reason: string;
+	}
+	export interface IrcErrorEventArgs {
+		error: string;
+		channel: string;
+		reason: string;
+		nick?: string;
+		command?: string;
+	}
+	export class Client extends EventEmitter {
+		constructor(options: ClientConstructorParameters);
+
+		// Added by Max
+		connection: ConnectionOpts;
+		network: {
+			options: {
+				CHANTYPES: string;
+				PREFIX: any;
+				CHANMODES: string;
+				NICKLEN: string;
+			};
+			cap: {
+				isEnabled: (cap: string) => boolean;
+				enabled: string[];
+			};
+			extractTargetGroup: (target: string) => any;
+			supports(feature: "MODES"): string;
+			supports(feature: string): boolean;
+		};
+		// End of added by Max
+
+		static setDefaultTransport(transport: any): void;
+
+		// get Message(): ClassDecorator;//TODO
+		/** Applies the default options to the options object given as impot, and returns it. */
+		_applyDefaultOptions(
+			user_options: ClientConstructorParameters
+		): ClientConstructorParameters;
+
+		createStructure(): void;
+
+		/** Is connected to the IRC network and successfully registered. */
+		connected: boolean;
+
+		// TODO
+		/** The object for the connected message, as long as the client is connected. */ user: IrcUser;
+
+		// TODO
+		/** Request */ requestCap(capability: string[]): void;
+
+		use(a: any): any;
+
+		connect(connect_options?: Record<string, unknown>): void;
+
+		/**
+		 * Proxy the command handler events onto the client object, with some added sugar
+		 * Events are handled in order:
+		 * 1. Received from the command handler
+		 * 2. Checked if any extra properties/methods are to be added to the params + re-emitted
+		 * 3. Routed through middleware
+		 * 4. Emitted from the client instance
+		 */
+		proxyIrcEvents(): void;
+
+		addCommandHandlerListeners(): void;
+
+		registerToNetwork(): void;
+
+		startPeriodicPing(): void;
+
+		raw(...raw_data_line: string[]): void;
+
+		rawString(...parameters: Array<string>): string;
+
+		rawString(parameters: Array<string>): string;
+
+		quit(quit_message?: string): void;
+
+		ping(message?: string): void;
+
+		changeNick(nick: string): void;
+
+		sendMessage(commandName: string, target: string, message: string): string[];
+
+		say(target: string, message: string): string[];
+
+		notice(target: string, message: string): string[];
+
+		join(channel: string, key?: string): void;
+
+		part(channel: string, message?: string): void;
+
+		mode(channel: string, mode: string, extra_args?: string[]): void;
+
+		inviteList(channel: string, cb?: (e: Event) => any): void;
+
+		// TODO: typeof e?
+		invite(channel: string, nick: string): void;
+
+		addInvite(channel: string, mask: string): void;
+
+		removeInvite(channel: string, mask: string): void;
+
+		banlist(channel: string, cb?: (e: Event) => any): void;
+
+		ban(channel: string, mask: string): void;
+
+		unban(channel: string, mask: string): void;
+
+		setTopic(channel: string, newTopic: string): void;
+
+		ctcpRequest(target: string, type: string, ...params: Array<string>): void;
+
+		ctcpResponse(target: string, type: string, ...params: Array<string>): void;
+
+		action(target: string, message: string): string[];
+
+		whowas(target: string, cb?: (event: Event) => any): void;
+
+		whois(nick: string, cb: (event: any) => void): void;
+
+		/**
+		 * WHO requests are queued up to run serially.
+		 * This is mostly because networks will only reply serially and it makes
+		 * it easier to include the correct replies to callbacks
+		 */
+		who(target: string, cb: (event: any) => void): void;
+
+		list(...params: Array<string>): void;
+
+		channel(channel_name: string): IrcChannel;
+
+		match(
+			match_regex: string,
+			cb: (event: Event) => any,
+			message_type: string
+		): {stop: () => void};
+
+		matchNotice(match_regex: string, cb: (event: Event) => any): void;
+
+		matchMessage(match_regex: string, cb: (event: Event) => any): void;
+
+		matchAction(match_regex: string, cb: (event: Event) => any): void;
+
+		stringToBlocks(str: string, block_size?: number): string[];
+
+		on(eventType: string | symbol, cb: (event: any) => void): this;
+
+		on(eventType: "raw", cb: (event: RawEventArgs) => void): this;
+
+		on(eventType: "join", cb: (event: JoinEventArgs) => void): this;
+
+		on(eventType: "registered", cb: (event: RegisteredEventArgs) => void): this;
+
+		on(eventType: "quit", cb: (event: QuitEventArgs) => void): this;
+
+		on(eventType: "part", cb: (event: QuitEventArgs) => void): this;
+
+		on(eventType: "kick", cb: (event: QuitEventArgs) => void): this;
+
+		on(eventType: "message", cb: (event: MessageEventArgs) => any): this;
+
+		on(eventType: "notice", cb: (event: MessageEventArgs /* TODO */) => any): this;
+
+		on(eventType: "mode", cb: (event: ModeEventArgs) => any): this;
+
+		on(eventType: "socket close", cb: (event: Record<string, unknown>) => any): this;
+
+		on(eventType: "socket connected", cb: (event: Record<string, unknown>) => any): this;
+
+		on(eventType: "raw socket connected", cb: (event: Record<string, unknown>) => any): this;
+
+		on(eventType: "server options", cb: (event: ServerOptionsEventArgs) => any): this;
+
+		on(eventType: "debug", cb: (message: string) => any): this;
+
+		on(eventType: "nick in use", cb: (event: NickInUseEventArgs) => any): this;
+
+		on(eventType: "nick invalid", cb: (event: NickInvalidEventArgs) => any): this;
+
+		on(eventType: "irc error", cb: (event: IrcErrorEventArgs) => any): this;
+	}
+	export class Message {
+		// TODO: What is actually in it and what was in the event?
+		constructor(command?: string, ...args: string[]);
+
+		account?: IrcUser;
+
+		group?: any;
+
+		hostname: string;
+
+		ident: string;
+
+		message: string;
+
+		nick: string;
+
+		reply(e: any): any;
+
+		tags: Record<string, unknown>;
+
+		// any
+		time?: any;
+
+		type: string;
+	}
+
+	// interface IrcUser {
+	//   /**The current nick you are currently using.*/
+	//   nick: string;
+	//   /**Your username (ident) that the network sees you as using.*/
+	//   username: string;
+	//   /**Your current gecos (realname).*/
+	//   gecos: string;
+	//   /**On supported servers, the hostname that the networksees you are using.*/
+	//   host: string;
+	//   /**Your current away status. Empty for not away.*/
+	//   away: string;
+	//   /**A set() instance with your current message modes.*/
+	//   modes: Set<string>;
+	// }
+	// TODO: what to call it? why is it channel.users empty after join?
+	interface IrcUser {
+		hostname: string;
+		ident: string;
+		modes: string[]; // any[]
+		nick: string;
+		username: string;
+		gecos: string;
+		host: string;
+	}
+
+	export interface ChannelInfoEventArgs {
+		channel: string;
+		created_at?: number;
+		modes?: Mode[]; // TODO: check type
+		url?: string;
+	}
+	class IrcChannel extends EventEmitter {
+		constructor(irc_client: Client, channel_name: string, key: string);
+
+		irc_client: Client;
+
+		name: string;
+
+		say(message: string): string[];
+
+		notice(message: string): string[];
+
+		join(key?: string): void;
+
+		part(message?: string): void;
+
+		mode(mode: string, extra_args?: string[]): void;
+
+		banlist(cb: (e: Event) => any): void;
+
+		ban(mask: string): void;
+
+		unban(mask: string): void;
+
+		users: IrcUser[];
+
+		/**
+		 * Relay messages between this channel to another
+		 * @param  {IrcChannel|String} target_chan Target channel
+		 * @param  {Object} opts        Extra options
+		 *
+		 * opts may contain the following properties:
+		 * one_way (false) Only relay messages to target_chan, not the reverse
+		 * replay_nicks (true) Include the sending nick as part of the relayed message
+		 */
+		relay(target_chan: IrcChannel | string, opts: Record<string, any>): void;
+
+		// stream(stream_ops: Object): DuplexStream;
+
+		updateUsers(cb: (channel: IrcChannel) => any): void;
+
+		on(eventType: "channel info", cb: (event: ChannelInfoEventArgs) => any): this;
+
+		on(eventType: string | symbol, cb: (event: any) => any): this;
+	}
+
+	export interface UserListEventArgs {
+		channel: string;
+		users: IrcUser[]; // TODO: check type
+	}
+	export interface WhoListEventArgs {
+		target: string;
+		users: IrcUser[]; // TODO: check type
+	}
+	export interface BanlistEventArgs {
+		channel: string;
+		bans: IrcUser[]; // TODO: check type
+	}
+	export interface TopicEventArgs {
+		channel: string;
+		topic: string;
+		nick?: string;
+		time?: number;
+	}
+	export interface TopicSetByEventArgs {
+		channel: string;
+		nick: string;
+		ident: string;
+		hostname: string;
+		when?: number;
+	}
+	interface ClientConstructorParameters {
+		host?: string;
+		nick?: string;
+		outgoing_addr?: string;
+		username?: string;
+		gecos?: string;
+		encoding?: string;
+		version?: string | boolean;
+		enable_chghost?: boolean;
+		enable_echomessage?: boolean;
+		enable_setname?: boolean;
+		message_max_length?: number;
+		auto_reconnect?: boolean;
+		auto_reconnect_wait?: number;
+		auto_reconnect_max_retries?: number;
+		ping_interval?: number;
+		ping_timeout?: number;
+		transport?: new (options: any) => Connection;
+		ssl?: boolean;
+		webirc?: {
+			password?: string;
+			username?: string;
+			hostname?: string;
+			ip?: string;
+		};
+	}
+}
diff --git a/server/types/socket-events.d.ts b/server/types/socket-events.d.ts
new file mode 100644
index 00000000..ccfe1e37
--- /dev/null
+++ b/server/types/socket-events.d.ts
@@ -0,0 +1,224 @@
+import {ClientMessage, ClientNetwork, InitClientChan} from "../../client/js/types";
+import {Mention} from "../client";
+import {ChanState} from "../models/chan";
+import Msg from "../models/msg";
+import Network from "../models/network";
+import User from "../models/user";
+import {ChangelogData} from "../plugins/changelog";
+import {LinkPreview} from "../plugins/irc-events/link";
+import {ClientConfiguration} from "../server";
+
+type Session = {
+	current: boolean;
+	active: number;
+	lastUse: number;
+	ip: string;
+	agent: string;
+	token: string;
+};
+
+interface ServerToClientEvents {
+	"auth:failed": () => void;
+	"auth:start": (serverHash: number) => void;
+	"auth:success": () => void;
+
+	"upload:auth": (token: string) => void;
+
+	changelog: (data: ChangelogData) => void;
+	"changelog:newversion": () => void;
+
+	"channel:state": (data: {chan: number; state: ChanState}) => void;
+
+	"change-password": ({success, error}: {success: boolean; error?: any}) => void;
+
+	commands: (data: string[]) => void;
+
+	configuration: (config: ClientConfiguration) => void;
+
+	"push:issubscribed": (isSubscribed: boolean) => void;
+	"push:unregister": () => void;
+
+	"sessions:list": (data: Session[]) => void;
+
+	"mentions:list": (data: Mention[]) => void;
+
+	"setting:new": ({name: string, value: any}) => void;
+	"setting:all": (settings: {[key: string]: any}) => void;
+
+	"history:clear": ({target}: {target: number}) => void;
+
+	"mute:changed": (response: {target: number; status: boolean}) => void;
+
+	names: (data: {id: number; users: User[]}) => void;
+
+	network: (data: {networks: ClientNetwork[]}) => void;
+	"network:options": (data: {network: string; serverOptions: {[key: string]: any}}) => void;
+	"network:status": (data: {network: string; connected: boolean; secure: boolean}) => void;
+	"network:info": (data: {uuid: string}) => void;
+	"network:name": (data: {uuid: string; name: string}) => void;
+
+	nick: (data: {network: string; nick: string}) => void;
+
+	open: (id: number) => void;
+
+	part: (data: {chan: number}) => void;
+
+	"sign-out": () => void;
+
+	sync_sort: (
+		data:
+			| {
+					type: "networks";
+					order: string[];
+					target: string;
+			  }
+			| {
+					type: "channels";
+					order: number[];
+					target: string;
+			  }
+	) => void;
+
+	topic: (data: {chan: number; topic: string}) => void;
+
+	users: (data: {chan: number}) => void;
+
+	more: ({
+		chan,
+		messages,
+		totalMessages,
+	}: {
+		chan: number;
+		messages: Msg[];
+		totalMessages: number;
+	}) => void;
+
+	"msg:preview": ({id, chan, preview}: {id: number; chan: number; preview: LinkPreview}) => void;
+	"msg:special": (data: {chan: number; data?: Record<string, any>}) => void;
+	msg: (data: {msg: ClientMessage; chan: number; highlight?: number; unread?: number}) => void;
+
+	init: ({
+		active,
+		networks,
+		token,
+	}: {
+		active: number;
+		networks: ClientNetwork[];
+		token: string;
+	}) => void;
+
+	"search:results": (response: {results: ClientMessage[]}) => void;
+
+	quit: (args: {network: string}) => void;
+
+	error: (error: any) => void;
+	connecting: () => void;
+
+	join: (args: {
+		shouldOpen: boolean;
+		index: number;
+		network: string;
+		chan: InitClientChan;
+	}) => void;
+}
+
+interface ClientToServerEvents {
+	"auth:perform":
+		| (({user, password}: {user: string; password: string}) => void)
+		| (({
+				user,
+				token,
+				lastMessage,
+				openChannel,
+				hasConfig,
+		  }: {
+				user: string;
+				token: string;
+				lastMessage: number;
+				openChannel: number | null;
+				hasConfig: boolean;
+		  }) => void);
+
+	changelog: () => void;
+
+	"change-password": ({
+		old_password: string,
+		new_password: string,
+		verify_password: string,
+	}) => void;
+
+	open: (channelId: number) => void;
+
+	names: ({target: number}) => void;
+
+	input: ({target, text}: {target: number; text: string}) => void;
+
+	"upload:auth": () => void;
+	"upload:ping": (token: string) => void;
+
+	"mute:change": (response: {target: number; setMutedTo: boolean}) => void;
+
+	"push:register": (subscriptionJson: PushSubscriptionJSON) => void;
+	"push:unregister": () => void;
+
+	"setting:get": () => void;
+	"setting:set": ({name: string, value: any}) => void;
+
+	"sessions:get": () => void;
+
+	sort: ({type, order}: {type: string; order: any; target?: string}) => void;
+
+	"mentions:dismiss": (msgId: number) => void;
+	"mentions:dismiss_all": () => void;
+	"mentions:get": () => void;
+
+	more: ({
+		target,
+		lastId,
+		condensed,
+	}: {
+		target: number;
+		lastId: number;
+		condensed: boolean;
+	}) => void;
+
+	"msg:preview:toggle": ({
+		target,
+		messageIds,
+		msgId,
+		shown,
+		link,
+	}: {
+		target: number;
+		messageIds?: number[];
+		msgId?: number;
+		shown?: boolean | null;
+		link?: string;
+	}) => void;
+
+	"network:get": (uuid: string) => void;
+	"network:edit": (data: Record<string, any>) => void;
+	"network:new": (data: Record<string, any>) => void;
+
+	"sign-out": (token?: string) => void;
+
+	"history:clear": ({target}: {target: number}) => void;
+
+	search: ({
+		networkUuid,
+		channelName,
+		searchTerm,
+		offset,
+	}: {
+		networkUuid?: string;
+		channelName?: string;
+		searchTerm?: string;
+		offset: number;
+	}) => void;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface InterServerEvents {}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface SocketData {}
diff --git a/src/client.js b/src/client.js
deleted file mode 100644
index b19f9db6..00000000
--- a/src/client.js
+++ /dev/null
@@ -1,771 +0,0 @@
-"use strict";
-
-const _ = require("lodash");
-const log = require("./log");
-const colors = require("chalk");
-const Chan = require("./models/chan");
-const crypto = require("crypto");
-const Msg = require("./models/msg");
-const Network = require("./models/network");
-const Config = require("./config");
-const UAParser = require("ua-parser-js");
-const {v4: uuidv4} = require("uuid");
-const escapeRegExp = require("lodash/escapeRegExp");
-const constants = require("../client/js/constants.js");
-const inputs = require("./plugins/inputs");
-const PublicClient = require("./plugins/packages/publicClient");
-
-const MessageStorage = require("./plugins/messageStorage/sqlite");
-const TextFileMessageStorage = require("./plugins/messageStorage/text");
-
-module.exports = Client;
-
-const events = [
-	"away",
-	"cap",
-	"connection",
-	"unhandled",
-	"ctcp",
-	"chghost",
-	"error",
-	"help",
-	"info",
-	"invite",
-	"join",
-	"kick",
-	"list",
-	"mode",
-	"modelist",
-	"motd",
-	"message",
-	"names",
-	"nick",
-	"part",
-	"quit",
-	"sasl",
-	"topic",
-	"welcome",
-	"whois",
-];
-
-function Client(manager, name, config = {}) {
-	_.merge(this, {
-		awayMessage: "",
-		lastActiveChannel: -1,
-		attachedClients: {},
-		config: config,
-		id: uuidv4(),
-		idChan: 1,
-		idMsg: 1,
-		name: name,
-		networks: [],
-		mentions: [],
-		manager: manager,
-		messageStorage: [],
-		highlightRegex: null,
-		highlightExceptionRegex: null,
-		messageProvider: undefined,
-	});
-
-	const client = this;
-
-	client.config.log = Boolean(client.config.log);
-	client.config.password = String(client.config.password);
-
-	if (!Config.values.public && client.config.log) {
-		if (Config.values.messageStorage.includes("sqlite")) {
-			client.messageProvider = new MessageStorage(client);
-			client.messageStorage.push(client.messageProvider);
-		}
-
-		if (Config.values.messageStorage.includes("text")) {
-			client.messageStorage.push(new TextFileMessageStorage(client));
-		}
-
-		for (const messageStorage of client.messageStorage) {
-			messageStorage.enable();
-		}
-	}
-
-	if (!_.isPlainObject(client.config.sessions)) {
-		client.config.sessions = {};
-	}
-
-	if (!_.isPlainObject(client.config.clientSettings)) {
-		client.config.clientSettings = {};
-	}
-
-	if (!_.isPlainObject(client.config.browser)) {
-		client.config.browser = {};
-	}
-
-	// TODO: Backwards compatibility with older versions, remove in a future release?
-	if (client.config.awayMessage) {
-		client.config.clientSettings.awayMessage = client.config.awayMessage;
-		delete client.config.awayMessage;
-	}
-
-	if (client.config.clientSettings.awayMessage) {
-		client.awayMessage = client.config.clientSettings.awayMessage;
-	}
-
-	client.config.clientSettings.searchEnabled = client.messageProvider !== undefined;
-
-	client.compileCustomHighlights();
-
-	_.forOwn(client.config.sessions, (session) => {
-		if (session.pushSubscription) {
-			this.registerPushSubscription(session, session.pushSubscription, true);
-		}
-	});
-
-	(client.config.networks || []).forEach((network) => client.connect(network, true));
-
-	// Networks are stored directly in the client object
-	// We don't need to keep it in the config object
-	delete client.config.networks;
-
-	if (client.name) {
-		log.info(`User ${colors.bold(client.name)} loaded`);
-
-		// Networks are created instantly, but to reduce server load on startup
-		// We randomize the IRC connections and channel log loading
-		let delay = manager.clients.length * 500;
-		client.networks.forEach((network) => {
-			setTimeout(() => {
-				network.channels.forEach((channel) => channel.loadMessages(client, network));
-
-				if (!network.userDisconnected && network.irc) {
-					network.irc.connect();
-				}
-			}, delay);
-
-			delay += 1000 + Math.floor(Math.random() * 1000);
-		});
-
-		client.fileHash = manager.getDataToSave(client).newHash;
-	}
-}
-
-Client.prototype.createChannel = function (attr) {
-	const chan = new Chan(attr);
-	chan.id = this.idChan++;
-
-	return chan;
-};
-
-Client.prototype.emit = function (event, data) {
-	if (this.manager !== null) {
-		this.manager.sockets.in(this.id).emit(event, data);
-	}
-};
-
-Client.prototype.find = function (channelId) {
-	let network = null;
-	let chan = null;
-
-	for (const i in this.networks) {
-		const n = this.networks[i];
-		chan = _.find(n.channels, {id: channelId});
-
-		if (chan) {
-			network = n;
-			break;
-		}
-	}
-
-	if (network && chan) {
-		return {network, chan};
-	}
-
-	return false;
-};
-
-Client.prototype.connect = function (args, isStartup = false) {
-	const client = this;
-	let channels = [];
-
-	// Get channel id for lobby before creating other channels for nicer ids
-	const lobbyChannelId = client.idChan++;
-
-	if (args.channels) {
-		let badName = false;
-
-		args.channels.forEach((chan) => {
-			if (!chan.name) {
-				badName = true;
-				return;
-			}
-
-			channels.push(
-				client.createChannel({
-					name: chan.name,
-					key: chan.key || "",
-					type: chan.type,
-					muted: chan.muted,
-				})
-			);
-		});
-
-		if (badName && client.name) {
-			log.warn(
-				"User '" +
-					client.name +
-					"' on network '" +
-					args.name +
-					"' has an invalid channel which has been ignored"
-			);
-		}
-		// `join` is kept for backwards compatibility when updating from versions <2.0
-		// also used by the "connect" window
-	} else if (args.join) {
-		channels = args.join
-			.replace(/,/g, " ")
-			.split(/\s+/g)
-			.map((chan) => {
-				if (!chan.match(/^[#&!+]/)) {
-					chan = `#${chan}`;
-				}
-
-				return client.createChannel({
-					name: chan,
-				});
-			});
-	}
-
-	const network = new Network({
-		uuid: args.uuid,
-		name: String(
-			args.name || (Config.values.lockNetwork ? Config.values.defaults.name : "") || ""
-		),
-		host: String(args.host || ""),
-		port: parseInt(args.port, 10),
-		tls: !!args.tls,
-		userDisconnected: !!args.userDisconnected,
-		rejectUnauthorized: !!args.rejectUnauthorized,
-		password: String(args.password || ""),
-		nick: String(args.nick || ""),
-		username: String(args.username || ""),
-		realname: String(args.realname || ""),
-		leaveMessage: String(args.leaveMessage || ""),
-		sasl: String(args.sasl || ""),
-		saslAccount: String(args.saslAccount || ""),
-		saslPassword: String(args.saslPassword || ""),
-		commands: args.commands || [],
-		channels: channels,
-		ignoreList: args.ignoreList ? args.ignoreList : [],
-
-		proxyEnabled: !!args.proxyEnabled,
-		proxyHost: String(args.proxyHost || ""),
-		proxyPort: parseInt(args.proxyPort, 10),
-		proxyUsername: String(args.proxyUsername || ""),
-		proxyPassword: String(args.proxyPassword || ""),
-	});
-
-	// Set network lobby channel id
-	network.channels[0].id = lobbyChannelId;
-
-	client.networks.push(network);
-	client.emit("network", {
-		networks: [network.getFilteredClone(this.lastActiveChannel, -1)],
-	});
-
-	if (!network.validate(client)) {
-		return;
-	}
-
-	network.createIrcFramework(client);
-
-	events.forEach((plugin) => {
-		require(`./plugins/irc-events/${plugin}`).apply(client, [network.irc, network]);
-	});
-
-	if (network.userDisconnected) {
-		network.channels[0].pushMessage(
-			client,
-			new Msg({
-				text: "You have manually disconnected from this network before, use the /connect command to connect again.",
-			}),
-			true
-		);
-	} else if (!isStartup) {
-		network.irc.connect();
-	}
-
-	if (!isStartup) {
-		client.save();
-		channels.forEach((channel) => channel.loadMessages(client, network));
-	}
-};
-
-Client.prototype.generateToken = function (callback) {
-	crypto.randomBytes(64, (err, buf) => {
-		if (err) {
-			throw err;
-		}
-
-		callback(buf.toString("hex"));
-	});
-};
-
-Client.prototype.calculateTokenHash = function (token) {
-	return crypto.createHash("sha512").update(token).digest("hex");
-};
-
-Client.prototype.updateSession = function (token, ip, request) {
-	const client = this;
-	const agent = UAParser(request.headers["user-agent"] || "");
-	let friendlyAgent = "";
-
-	if (agent.browser.name) {
-		friendlyAgent = `${agent.browser.name} ${agent.browser.major}`;
-	} else {
-		friendlyAgent = "Unknown browser";
-	}
-
-	if (agent.os.name) {
-		friendlyAgent += ` on ${agent.os.name}`;
-
-		if (agent.os.version) {
-			friendlyAgent += ` ${agent.os.version}`;
-		}
-	}
-
-	client.config.sessions[token] = _.assign(client.config.sessions[token], {
-		lastUse: Date.now(),
-		ip: ip,
-		agent: friendlyAgent,
-	});
-
-	client.save();
-};
-
-Client.prototype.setPassword = function (hash, callback) {
-	const client = this;
-
-	const oldHash = client.config.password;
-	client.config.password = hash;
-	client.manager.saveUser(client, function (err) {
-		if (err) {
-			// If user file fails to write, reset it back
-			client.config.password = oldHash;
-			return callback(false);
-		}
-
-		return callback(true);
-	});
-};
-
-Client.prototype.input = function (data) {
-	const client = this;
-	data.text.split("\n").forEach((line) => {
-		data.text = line;
-		client.inputLine(data);
-	});
-};
-
-Client.prototype.inputLine = function (data) {
-	const client = this;
-	const target = client.find(data.target);
-
-	if (!target) {
-		return;
-	}
-
-	// Sending a message to a channel is higher priority than merely opening one
-	// so that reloading the page will open this channel
-	this.lastActiveChannel = target.chan.id;
-
-	let text = data.text;
-
-	// This is either a normal message or a command escaped with a leading '/'
-	if (text.charAt(0) !== "/" || text.charAt(1) === "/") {
-		if (target.chan.type === Chan.Type.LOBBY) {
-			target.chan.pushMessage(
-				this,
-				new Msg({
-					type: Msg.Type.ERROR,
-					text: "Messages can not be sent to lobbies.",
-				})
-			);
-			return;
-		}
-
-		text = "say " + text.replace(/^\//, "");
-	} else {
-		text = text.substr(1);
-	}
-
-	const args = text.split(" ");
-	const cmd = args.shift().toLowerCase();
-
-	const irc = target.network.irc;
-	let connected = irc && irc.connection && irc.connection.connected;
-
-	if (inputs.userInputs.has(cmd)) {
-		const plugin = inputs.userInputs.get(cmd);
-
-		if (typeof plugin.input === "function" && (connected || plugin.allowDisconnected)) {
-			connected = true;
-			plugin.input.apply(client, [target.network, target.chan, cmd, args]);
-		}
-	} else if (inputs.pluginCommands.has(cmd)) {
-		const plugin = inputs.pluginCommands.get(cmd);
-
-		if (typeof plugin.input === "function" && (connected || plugin.allowDisconnected)) {
-			connected = true;
-			plugin.input(
-				new PublicClient(client, plugin.packageInfo),
-				{network: target.network, chan: target.chan},
-				cmd,
-				args
-			);
-		}
-	} else if (connected) {
-		irc.raw(text);
-	}
-
-	if (!connected) {
-		target.chan.pushMessage(
-			this,
-			new Msg({
-				type: Msg.Type.ERROR,
-				text: "You are not connected to the IRC network, unable to send your command.",
-			})
-		);
-	}
-};
-
-Client.prototype.compileCustomHighlights = function () {
-	this.highlightRegex = compileHighlightRegex(this.config.clientSettings.highlights);
-	this.highlightExceptionRegex = compileHighlightRegex(
-		this.config.clientSettings.highlightExceptions
-	);
-};
-
-function compileHighlightRegex(customHighlightString) {
-	if (typeof customHighlightString !== "string") {
-		return null;
-	}
-
-	// Ensure we don't have empty strings in the list of highlights
-	const highlightsTokens = customHighlightString
-		.split(",")
-		.map((highlight) => escapeRegExp(highlight.trim()))
-		.filter((highlight) => highlight.length > 0);
-
-	if (highlightsTokens.length === 0) {
-		return null;
-	}
-
-	return new RegExp(
-		`(?:^|[ .,+!?|/:<>(){}'"@&~-])(?:${highlightsTokens.join("|")})(?:$|[ .,+!?|/:<>(){}'"-])`,
-		"i"
-	);
-}
-
-Client.prototype.more = function (data) {
-	const client = this;
-	const target = client.find(data.target);
-
-	if (!target) {
-		return null;
-	}
-
-	const chan = target.chan;
-	let messages = [];
-	let index = 0;
-
-	// If client requests -1, send last 100 messages
-	if (data.lastId < 0) {
-		index = chan.messages.length;
-	} else {
-		index = chan.messages.findIndex((val) => val.id === data.lastId);
-	}
-
-	// If requested id is not found, an empty array will be sent
-	if (index > 0) {
-		let startIndex = index;
-
-		if (data.condensed) {
-			// Limit to 1000 messages (that's 10x normal limit)
-			const indexToStop = Math.max(0, index - 1000);
-			let realMessagesLeft = 100;
-
-			for (let i = index - 1; i >= indexToStop; i--) {
-				startIndex--;
-
-				// Do not count condensed messages towards the 100 messages
-				if (constants.condensedTypes.has(chan.messages[i].type)) {
-					continue;
-				}
-
-				// Count up actual 100 visible messages
-				if (--realMessagesLeft === 0) {
-					break;
-				}
-			}
-		} else {
-			startIndex = Math.max(0, index - 100);
-		}
-
-		messages = chan.messages.slice(startIndex, index);
-	}
-
-	return {
-		chan: chan.id,
-		messages: messages,
-		totalMessages: chan.messages.length,
-	};
-};
-
-Client.prototype.clearHistory = function (data) {
-	const client = this;
-	const target = client.find(data.target);
-
-	if (!target) {
-		return;
-	}
-
-	target.chan.messages = [];
-	target.chan.unread = 0;
-	target.chan.highlight = 0;
-	target.chan.firstUnread = 0;
-
-	client.emit("history:clear", {
-		target: target.chan.id,
-	});
-
-	if (!target.chan.isLoggable()) {
-		return;
-	}
-
-	for (const messageStorage of this.messageStorage) {
-		messageStorage.deleteChannel(target.network, target.chan);
-	}
-};
-
-Client.prototype.search = function (query) {
-	if (this.messageProvider === undefined) {
-		return Promise.resolve([]);
-	}
-
-	return this.messageProvider.search(query);
-};
-
-Client.prototype.open = function (socketId, target) {
-	// Due to how socket.io works internally, normal events may arrive later than
-	// the disconnect event, and because we can't control this timing precisely,
-	// process this event normally even if there is no attached client anymore.
-	const attachedClient = this.attachedClients[socketId] || {};
-
-	// Opening a window like settings
-	if (target === null) {
-		attachedClient.openChannel = -1;
-		return;
-	}
-
-	target = this.find(target);
-
-	if (!target) {
-		return;
-	}
-
-	target.chan.unread = 0;
-	target.chan.highlight = 0;
-
-	if (target.chan.messages.length > 0) {
-		target.chan.firstUnread = target.chan.messages[target.chan.messages.length - 1].id;
-	}
-
-	attachedClient.openChannel = target.chan.id;
-	this.lastActiveChannel = target.chan.id;
-
-	this.emit("open", target.chan.id);
-};
-
-Client.prototype.sort = function (data) {
-	const order = data.order;
-
-	if (!_.isArray(order)) {
-		return;
-	}
-
-	switch (data.type) {
-		case "networks":
-			this.networks.sort((a, b) => order.indexOf(a.uuid) - order.indexOf(b.uuid));
-
-			// Sync order to connected clients
-			this.emit("sync_sort", {
-				order: this.networks.map((obj) => obj.uuid),
-				type: data.type,
-			});
-
-			break;
-
-		case "channels": {
-			const network = _.find(this.networks, {uuid: data.target});
-
-			if (!network) {
-				return;
-			}
-
-			network.channels.sort((a, b) => {
-				// Always sort lobby to the top regardless of what the client has sent
-				// Because there's a lot of code that presumes channels[0] is the lobby
-				if (a.type === Chan.Type.LOBBY) {
-					return -1;
-				} else if (b.type === Chan.Type.LOBBY) {
-					return 1;
-				}
-
-				return order.indexOf(a.id) - order.indexOf(b.id);
-			});
-
-			// Sync order to connected clients
-			this.emit("sync_sort", {
-				order: network.channels.map((obj) => obj.id),
-				type: data.type,
-				target: network.uuid,
-			});
-
-			break;
-		}
-	}
-
-	this.save();
-};
-
-Client.prototype.names = function (data) {
-	const client = this;
-	const target = client.find(data.target);
-
-	if (!target) {
-		return;
-	}
-
-	client.emit("names", {
-		id: target.chan.id,
-		users: target.chan.getSortedUsers(target.network.irc),
-	});
-};
-
-Client.prototype.part = function (network, chan) {
-	const client = this;
-	network.channels = _.without(network.channels, chan);
-	client.mentions = client.mentions.filter((msg) => !(msg.chanId === chan.id));
-	chan.destroy();
-	client.save();
-	client.emit("part", {
-		chan: chan.id,
-	});
-};
-
-Client.prototype.quit = function (signOut) {
-	const sockets = this.manager.sockets.sockets;
-	const room = sockets.adapter.rooms.get(this.id);
-
-	if (room) {
-		for (const user of room) {
-			const socket = sockets.sockets.get(user);
-
-			if (socket) {
-				if (signOut) {
-					socket.emit("sign-out");
-				}
-
-				socket.disconnect();
-			}
-		}
-	}
-
-	this.networks.forEach((network) => {
-		network.quit();
-		network.destroy();
-	});
-
-	for (const messageStorage of this.messageStorage) {
-		messageStorage.close();
-	}
-};
-
-Client.prototype.clientAttach = function (socketId, token) {
-	const client = this;
-
-	if (client.awayMessage && _.size(client.attachedClients) === 0) {
-		client.networks.forEach(function (network) {
-			// Only remove away on client attachment if
-			// there is no away message on this network
-			if (network.irc && !network.awayMessage) {
-				network.irc.raw("AWAY");
-			}
-		});
-	}
-
-	const openChannel = client.lastActiveChannel;
-	client.attachedClients[socketId] = {token, openChannel};
-};
-
-Client.prototype.clientDetach = function (socketId) {
-	const client = this;
-
-	delete this.attachedClients[socketId];
-
-	if (client.awayMessage && _.size(client.attachedClients) === 0) {
-		client.networks.forEach(function (network) {
-			// Only set away on client deattachment if
-			// there is no away message on this network
-			if (network.irc && !network.awayMessage) {
-				network.irc.raw("AWAY", client.awayMessage);
-			}
-		});
-	}
-};
-
-Client.prototype.registerPushSubscription = function (session, subscription, noSave) {
-	if (
-		!_.isPlainObject(subscription) ||
-		!_.isPlainObject(subscription.keys) ||
-		typeof subscription.endpoint !== "string" ||
-		!/^https?:\/\//.test(subscription.endpoint) ||
-		typeof subscription.keys.p256dh !== "string" ||
-		typeof subscription.keys.auth !== "string"
-	) {
-		session.pushSubscription = null;
-		return;
-	}
-
-	const data = {
-		endpoint: subscription.endpoint,
-		keys: {
-			p256dh: subscription.keys.p256dh,
-			auth: subscription.keys.auth,
-		},
-	};
-
-	session.pushSubscription = data;
-
-	if (!noSave) {
-		this.save();
-	}
-
-	return data;
-};
-
-Client.prototype.unregisterPushSubscription = function (token) {
-	this.config.sessions[token].pushSubscription = null;
-	this.save();
-};
-
-Client.prototype.save = _.debounce(
-	function SaveClient() {
-		if (Config.values.public) {
-			return;
-		}
-
-		const client = this;
-		client.manager.saveUser(client);
-	},
-	5000,
-	{maxWait: 20000}
-);
diff --git a/src/clientManager.js b/src/clientManager.js
deleted file mode 100644
index dc31317c..00000000
--- a/src/clientManager.js
+++ /dev/null
@@ -1,284 +0,0 @@
-"use strict";
-
-const _ = require("lodash");
-const log = require("./log");
-const colors = require("chalk");
-const crypto = require("crypto");
-const fs = require("fs");
-const path = require("path");
-const Auth = require("./plugins/auth");
-const Client = require("./client");
-const Config = require("./config");
-const WebPush = require("./plugins/webpush");
-
-module.exports = ClientManager;
-
-function ClientManager() {
-	this.clients = [];
-}
-
-ClientManager.prototype.init = function (identHandler, sockets) {
-	this.sockets = sockets;
-	this.identHandler = identHandler;
-	this.webPush = new WebPush();
-
-	if (!Config.values.public) {
-		this.loadUsers();
-
-		// LDAP does not have user commands, and users are dynamically
-		// created upon logon, so we don't need to watch for new files
-		if (!Config.values.ldap.enable) {
-			this.autoloadUsers();
-		}
-	}
-};
-
-ClientManager.prototype.findClient = function (name) {
-	name = name.toLowerCase();
-	return this.clients.find((u) => u.name.toLowerCase() === name);
-};
-
-ClientManager.prototype.loadUsers = function () {
-	let users = this.getUsers();
-
-	if (users.length === 0) {
-		log.info(
-			`There are currently no users. Create one with ${colors.bold("thelounge add <name>")}.`
-		);
-
-		return;
-	}
-
-	const alreadySeenUsers = new Set();
-	users = users.filter((user) => {
-		user = user.toLowerCase();
-
-		if (alreadySeenUsers.has(user)) {
-			log.error(
-				`There is more than one user named "${colors.bold(
-					user
-				)}". Usernames are now case insensitive, duplicate users will not load.`
-			);
-
-			return false;
-		}
-
-		alreadySeenUsers.add(user);
-
-		return true;
-	});
-
-	// This callback is used by Auth plugins to load users they deem acceptable
-	const callbackLoadUser = (user) => {
-		this.loadUser(user);
-	};
-
-	if (!Auth.loadUsers(users, callbackLoadUser)) {
-		// Fallback to loading all users
-		users.forEach((name) => this.loadUser(name));
-	}
-};
-
-ClientManager.prototype.autoloadUsers = function () {
-	fs.watch(
-		Config.getUsersPath(),
-		_.debounce(
-			() => {
-				const loaded = this.clients.map((c) => c.name);
-				const updatedUsers = this.getUsers();
-
-				if (updatedUsers.length === 0) {
-					log.info(
-						`There are currently no users. Create one with ${colors.bold(
-							"thelounge add <name>"
-						)}.`
-					);
-				}
-
-				// Reload all users. Existing users will only have their passwords reloaded.
-				updatedUsers.forEach((name) => this.loadUser(name));
-
-				// Existing users removed since last time users were loaded
-				_.difference(loaded, updatedUsers).forEach((name) => {
-					const client = _.find(this.clients, {name});
-
-					if (client) {
-						client.quit(true);
-						this.clients = _.without(this.clients, client);
-						log.info(`User ${colors.bold(name)} disconnected and removed.`);
-					}
-				});
-			},
-			1000,
-			{maxWait: 10000}
-		)
-	);
-};
-
-ClientManager.prototype.loadUser = function (name) {
-	const userConfig = readUserConfig(name);
-
-	if (!userConfig) {
-		return;
-	}
-
-	let client = this.findClient(name);
-
-	if (client) {
-		if (userConfig.password !== client.config.password) {
-			/**
-			 * If we happen to reload an existing client, make super duper sure we
-			 * have their latest password. We're not replacing the entire config
-			 * object, because that could have undesired consequences.
-			 *
-			 * @see https://github.com/thelounge/thelounge/issues/598
-			 */
-			client.config.password = userConfig.password;
-			log.info(`Password for user ${colors.bold(name)} was reset.`);
-		}
-	} else {
-		client = new Client(this, name, userConfig);
-		this.clients.push(client);
-	}
-
-	return client;
-};
-
-ClientManager.prototype.getUsers = function () {
-	if (!fs.existsSync(Config.getUsersPath())) {
-		return [];
-	}
-
-	return fs
-		.readdirSync(Config.getUsersPath())
-		.filter((file) => file.endsWith(".json"))
-		.map((file) => file.slice(0, -5));
-};
-
-ClientManager.prototype.addUser = function (name, password, enableLog) {
-	if (path.basename(name) !== name) {
-		throw new Error(`${name} is an invalid username.`);
-	}
-
-	const userPath = Config.getUserConfigPath(name);
-
-	if (fs.existsSync(userPath)) {
-		log.error(`User ${colors.green(name)} already exists.`);
-		return false;
-	}
-
-	const user = {
-		password: password || "",
-		log: enableLog,
-	};
-
-	try {
-		fs.writeFileSync(userPath, JSON.stringify(user, null, "\t"), {
-			mode: 0o600,
-		});
-	} catch (e) {
-		log.error(`Failed to create user ${colors.green(name)} (${e})`);
-		throw e;
-	}
-
-	try {
-		const userFolderStat = fs.statSync(Config.getUsersPath());
-		const userFileStat = fs.statSync(userPath);
-
-		if (
-			userFolderStat &&
-			userFileStat &&
-			(userFolderStat.uid !== userFileStat.uid || userFolderStat.gid !== userFileStat.gid)
-		) {
-			log.warn(
-				`User ${colors.green(
-					name
-				)} has been created, but with a different uid (or gid) than expected.`
-			);
-			log.warn(
-				"The file owner has been changed to the expected user. " +
-					"To prevent any issues, please run thelounge commands " +
-					"as the correct user that owns the config folder."
-			);
-			log.warn(
-				"See https://thelounge.chat/docs/usage#using-the-correct-system-user for more information."
-			);
-			fs.chownSync(userPath, userFolderStat.uid, userFolderStat.gid);
-		}
-	} catch (e) {
-		// We're simply verifying file owner as a safe guard for users
-		// that run `thelounge add` as root, so we don't care if it fails
-	}
-
-	return true;
-};
-
-ClientManager.prototype.getDataToSave = function (client) {
-	const json = Object.assign({}, client.config, {
-		networks: client.networks.map((n) => n.export()),
-	});
-	const newUser = JSON.stringify(json, null, "\t");
-	const newHash = crypto.createHash("sha256").update(newUser).digest("hex");
-
-	return {newUser, newHash};
-};
-
-ClientManager.prototype.saveUser = function (client, callback) {
-	const {newUser, newHash} = this.getDataToSave(client);
-
-	// Do not write to disk if the exported data hasn't actually changed
-	if (client.fileHash === newHash) {
-		return;
-	}
-
-	const pathReal = Config.getUserConfigPath(client.name);
-	const pathTemp = pathReal + ".tmp";
-
-	try {
-		// Write to a temp file first, in case the write fails
-		// we do not lose the original file (for example when disk is full)
-		fs.writeFileSync(pathTemp, newUser, {
-			mode: 0o600,
-		});
-		fs.renameSync(pathTemp, pathReal);
-
-		return callback ? callback() : true;
-	} catch (e) {
-		log.error(`Failed to update user ${colors.green(client.name)} (${e})`);
-
-		if (callback) {
-			callback(e);
-		}
-	}
-};
-
-ClientManager.prototype.removeUser = function (name) {
-	const userPath = Config.getUserConfigPath(name);
-
-	if (!fs.existsSync(userPath)) {
-		log.error(`Tried to remove non-existing user ${colors.green(name)}.`);
-		return false;
-	}
-
-	fs.unlinkSync(userPath);
-
-	return true;
-};
-
-function readUserConfig(name) {
-	const userPath = Config.getUserConfigPath(name);
-
-	if (!fs.existsSync(userPath)) {
-		log.error(`Tried to read non-existing user ${colors.green(name)}`);
-		return false;
-	}
-
-	try {
-		const data = fs.readFileSync(userPath, "utf-8");
-		return JSON.parse(data);
-	} catch (e) {
-		log.error(`Failed to read user ${colors.bold(name)}: ${e}`);
-	}
-
-	return false;
-}
diff --git a/src/command-line/uninstall.js b/src/command-line/uninstall.js
deleted file mode 100644
index a7565bc9..00000000
--- a/src/command-line/uninstall.js
+++ /dev/null
@@ -1,38 +0,0 @@
-"use strict";
-
-const log = require("../log");
-const colors = require("chalk");
-const program = require("commander");
-const Config = require("../config");
-const Utils = require("./utils");
-
-program
-	.command("uninstall <package>")
-	.description("Uninstall a theme or a package")
-	.on("--help", Utils.extraHelp)
-	.action(function (packageName) {
-		const fs = require("fs");
-		const path = require("path");
-
-		const packagesConfig = path.join(Config.getPackagesPath(), "package.json");
-		const packages = JSON.parse(fs.readFileSync(packagesConfig, "utf-8"));
-
-		if (
-			!packages.dependencies ||
-			!Object.prototype.hasOwnProperty.call(packages.dependencies, packageName)
-		) {
-			log.warn(`${colors.green(packageName)} is not installed.`);
-			process.exit(1);
-		}
-
-		log.info(`Uninstalling ${colors.green(packageName)}...`);
-
-		return Utils.executeYarnCommand("remove", packageName)
-			.then(() => {
-				log.info(`${colors.green(packageName)} has been successfully uninstalled.`);
-			})
-			.catch((code) => {
-				log.error(`Failed to uninstall ${colors.green(packageName)}. Exit code: ${code}`);
-				process.exit(1);
-			});
-	});
diff --git a/src/command-line/users/index.js b/src/command-line/users/index.js
deleted file mode 100644
index 76ed999f..00000000
--- a/src/command-line/users/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-"use strict";
-
-if (!require("../../config").values.ldap.enable) {
-	require("./add");
-	require("./reset");
-}
-
-require("./list");
-require("./remove");
-require("./edit");
diff --git a/src/models/chan.js b/src/models/chan.js
deleted file mode 100644
index 451cdc6a..00000000
--- a/src/models/chan.js
+++ /dev/null
@@ -1,304 +0,0 @@
-"use strict";
-
-const _ = require("lodash");
-const log = require("../log");
-const Config = require("../config");
-const User = require("./user");
-const Msg = require("./msg");
-const storage = require("../plugins/storage");
-
-module.exports = Chan;
-
-Chan.Type = {
-	CHANNEL: "channel",
-	LOBBY: "lobby",
-	QUERY: "query",
-	SPECIAL: "special",
-};
-
-Chan.SpecialType = {
-	BANLIST: "list_bans",
-	INVITELIST: "list_invites",
-	CHANNELLIST: "list_channels",
-	IGNORELIST: "list_ignored",
-};
-
-Chan.State = {
-	PARTED: 0,
-	JOINED: 1,
-};
-
-function Chan(attr) {
-	_.defaults(this, attr, {
-		id: 0,
-		messages: [],
-		name: "",
-		key: "",
-		topic: "",
-		type: Chan.Type.CHANNEL,
-		state: Chan.State.PARTED,
-		firstUnread: 0,
-		unread: 0,
-		highlight: 0,
-		users: new Map(),
-		muted: false,
-	});
-}
-
-Chan.prototype.destroy = function () {
-	this.dereferencePreviews(this.messages);
-};
-
-Chan.prototype.pushMessage = function (client, msg, increasesUnread) {
-	const chan = this.id;
-	const obj = {chan, msg};
-
-	msg.id = client.idMsg++;
-
-	// If this channel is open in any of the clients, do not increase unread counter
-	const isOpen = _.find(client.attachedClients, {openChannel: chan}) !== undefined;
-
-	if (msg.self) {
-		// reset counters/markers when receiving self-/echo-message
-		this.unread = 0;
-		this.firstUnread = msg.id;
-		this.highlight = 0;
-	} else if (!isOpen) {
-		if (!this.firstUnread) {
-			this.firstUnread = msg.id;
-		}
-
-		if (increasesUnread || msg.highlight) {
-			obj.unread = ++this.unread;
-		}
-
-		if (msg.highlight) {
-			obj.highlight = ++this.highlight;
-		}
-	}
-
-	client.emit("msg", obj);
-
-	// Never store messages in public mode as the session
-	// is completely destroyed when the page gets closed
-	if (Config.values.public) {
-		return;
-	}
-
-	// showInActive is only processed on "msg", don't need it on page reload
-	if (msg.showInActive) {
-		delete msg.showInActive;
-	}
-
-	this.writeUserLog(client, msg);
-
-	if (Config.values.maxHistory >= 0 && this.messages.length > Config.values.maxHistory) {
-		const deleted = this.messages.splice(0, this.messages.length - Config.values.maxHistory);
-
-		// If maxHistory is 0, image would be dereferenced before client had a chance to retrieve it,
-		// so for now, just don't implement dereferencing for this edge case.
-		if (Config.values.maxHistory > 0) {
-			this.dereferencePreviews(deleted);
-		}
-	}
-};
-
-Chan.prototype.dereferencePreviews = function (messages) {
-	if (!Config.values.prefetch || !Config.values.prefetchStorage) {
-		return;
-	}
-
-	messages.forEach((message) => {
-		if (message.previews) {
-			message.previews.forEach((preview) => {
-				if (preview.thumb) {
-					storage.dereference(preview.thumb);
-					preview.thumb = "";
-				}
-			});
-		}
-	});
-};
-
-Chan.prototype.getSortedUsers = function (irc) {
-	const users = Array.from(this.users.values());
-
-	if (!irc || !irc.network || !irc.network.options || !irc.network.options.PREFIX) {
-		return users;
-	}
-
-	const userModeSortPriority = {};
-	irc.network.options.PREFIX.forEach((prefix, index) => {
-		userModeSortPriority[prefix.symbol] = index;
-	});
-
-	userModeSortPriority[""] = 99; // No mode is lowest
-
-	return users.sort(function (a, b) {
-		if (a.mode === b.mode) {
-			return a.nick.toLowerCase() < b.nick.toLowerCase() ? -1 : 1;
-		}
-
-		return userModeSortPriority[a.mode] - userModeSortPriority[b.mode];
-	});
-};
-
-Chan.prototype.findMessage = function (msgId) {
-	return this.messages.find((message) => message.id === msgId);
-};
-
-Chan.prototype.findUser = function (nick) {
-	return this.users.get(nick.toLowerCase());
-};
-
-Chan.prototype.getUser = function (nick) {
-	return this.findUser(nick) || new User({nick});
-};
-
-Chan.prototype.setUser = function (user) {
-	this.users.set(user.nick.toLowerCase(), user);
-};
-
-Chan.prototype.removeUser = function (user) {
-	this.users.delete(user.nick.toLowerCase());
-};
-
-/**
- * Get a clean clone of this channel that will be sent to the client.
- * This function performs manual cloning of channel object for
- * better control of performance and memory usage.
- *
- * @param {(int|bool)} lastActiveChannel - Last known active user channel id (needed to control how many messages are sent)
- *                                         If true, channel is assumed active.
- * @param {int} lastMessage - Last message id seen by active client to avoid sending duplicates.
- */
-Chan.prototype.getFilteredClone = function (lastActiveChannel, lastMessage) {
-	return Object.keys(this).reduce((newChannel, prop) => {
-		if (prop === "users") {
-			// Do not send users, client requests updated user list whenever needed
-			newChannel[prop] = [];
-		} else if (prop === "messages") {
-			// If client is reconnecting, only send new messages that client has not seen yet
-			if (lastMessage > -1) {
-				// When reconnecting, always send up to 100 messages to prevent message gaps on the client
-				// See https://github.com/thelounge/thelounge/issues/1883
-				newChannel[prop] = this[prop].filter((m) => m.id > lastMessage).slice(-100);
-			} else {
-				// If channel is active, send up to 100 last messages, for all others send just 1
-				// Client will automatically load more messages whenever needed based on last seen messages
-				const messagesToSend =
-					lastActiveChannel === true || this.id === lastActiveChannel ? 100 : 1;
-
-				newChannel[prop] = this[prop].slice(-messagesToSend);
-			}
-
-			newChannel.totalMessages = this[prop].length;
-		} else {
-			newChannel[prop] = this[prop];
-		}
-
-		return newChannel;
-	}, {});
-};
-
-Chan.prototype.writeUserLog = function (client, msg) {
-	this.messages.push(msg);
-
-	// Are there any logs enabled
-	if (client.messageStorage.length === 0) {
-		return;
-	}
-
-	let targetChannel = this;
-
-	// Is this particular message or channel loggable
-	if (!msg.isLoggable() || !this.isLoggable()) {
-		// Because notices are nasty and can be shown in active channel on the client
-		// if there is no open query, we want to always log notices in the sender's name
-		if (msg.type === Msg.Type.NOTICE && msg.showInActive) {
-			targetChannel = {
-				name: msg.from.nick,
-			};
-		} else {
-			return;
-		}
-	}
-
-	// Find the parent network where this channel is in
-	const target = client.find(this.id);
-
-	if (!target) {
-		return;
-	}
-
-	for (const messageStorage of client.messageStorage) {
-		messageStorage.index(target.network, targetChannel, msg);
-	}
-};
-
-Chan.prototype.loadMessages = function (client, network) {
-	if (!this.isLoggable()) {
-		return;
-	}
-
-	if (!network.irc) {
-		// Network created, but misconfigured
-		log.warn(
-			`Failed to load messages for ${client.name}, network ${network.name} is not initialized.`
-		);
-		return;
-	}
-
-	if (!client.messageProvider) {
-		if (network.irc.network.cap.isEnabled("znc.in/playback")) {
-			// if we do have a message provider we might be able to only fetch partial history,
-			// so delay the cap in this case.
-			requestZncPlayback(this, network, 0);
-		}
-
-		return;
-	}
-
-	client.messageProvider
-		.getMessages(network, this)
-		.then((messages) => {
-			if (messages.length === 0) {
-				if (network.irc.network.cap.isEnabled("znc.in/playback")) {
-					requestZncPlayback(this, network, 0);
-				}
-
-				return;
-			}
-
-			this.messages.unshift(...messages);
-
-			if (!this.firstUnread) {
-				this.firstUnread = messages[messages.length - 1].id;
-			}
-
-			client.emit("more", {
-				chan: this.id,
-				messages: messages.slice(-100),
-				totalMessages: messages.length,
-			});
-
-			if (network.irc.network.cap.isEnabled("znc.in/playback")) {
-				const from = Math.floor(messages[messages.length - 1].time.getTime() / 1000);
-
-				requestZncPlayback(this, network, from);
-			}
-		})
-		.catch((err) => log.error(`Failed to load messages for ${client.name}: ${err}`));
-};
-
-Chan.prototype.isLoggable = function () {
-	return this.type === Chan.Type.CHANNEL || this.type === Chan.Type.QUERY;
-};
-
-Chan.prototype.setMuteStatus = function (muted) {
-	this.muted = !!muted;
-};
-
-function requestZncPlayback(channel, network, from) {
-	network.irc.raw("ZNC", "*playback", "PLAY", channel.name, from.toString());
-}
diff --git a/src/models/msg.js b/src/models/msg.js
deleted file mode 100644
index 0d61dace..00000000
--- a/src/models/msg.js
+++ /dev/null
@@ -1,92 +0,0 @@
-"use strict";
-
-const _ = require("lodash");
-
-class Msg {
-	constructor(attr) {
-		// Some properties need to be copied in the Msg object instead of referenced
-		if (attr) {
-			["from", "target"].forEach((prop) => {
-				if (attr[prop]) {
-					this[prop] = {
-						mode: attr[prop].mode,
-						nick: attr[prop].nick,
-					};
-				}
-			});
-		}
-
-		_.defaults(this, attr, {
-			from: {},
-			id: 0,
-			previews: [],
-			text: "",
-			type: Msg.Type.MESSAGE,
-			self: false,
-		});
-
-		if (this.time > 0) {
-			this.time = new Date(this.time);
-		} else {
-			this.time = new Date();
-		}
-	}
-
-	findPreview(link) {
-		return this.previews.find((preview) => preview.link === link);
-	}
-
-	isLoggable() {
-		if (this.type === Msg.Type.TOPIC) {
-			// Do not log topic that is sent on channel join
-			return !!this.from.nick;
-		}
-
-		switch (this.type) {
-			case Msg.Type.MONOSPACE_BLOCK:
-			case Msg.Type.ERROR:
-			case Msg.Type.TOPIC_SET_BY:
-			case Msg.Type.MODE_CHANNEL:
-			case Msg.Type.MODE_USER:
-			case Msg.Type.RAW:
-			case Msg.Type.WHOIS:
-			case Msg.Type.PLUGIN:
-				return false;
-			default:
-				return true;
-		}
-	}
-}
-
-Msg.Type = {
-	UNHANDLED: "unhandled",
-	ACTION: "action",
-	AWAY: "away",
-	BACK: "back",
-	ERROR: "error",
-	INVITE: "invite",
-	JOIN: "join",
-	KICK: "kick",
-	LOGIN: "login",
-	LOGOUT: "logout",
-	MESSAGE: "message",
-	MODE: "mode",
-	MODE_CHANNEL: "mode_channel",
-	MODE_USER: "mode_user", // RPL_UMODEIS
-	MONOSPACE_BLOCK: "monospace_block",
-	NICK: "nick",
-	NOTICE: "notice",
-	PART: "part",
-	QUIT: "quit",
-	CTCP: "ctcp",
-	CTCP_REQUEST: "ctcp_request",
-	CHGHOST: "chghost",
-	TOPIC: "topic",
-	TOPIC_SET_BY: "topic_set_by",
-	WHOIS: "whois",
-	RAW: "raw",
-	PLUGIN: "plugin",
-	WALLOPS: "wallops",
-};
-
-module.exports = Msg;
diff --git a/src/models/network.js b/src/models/network.js
deleted file mode 100644
index 1ceee867..00000000
--- a/src/models/network.js
+++ /dev/null
@@ -1,558 +0,0 @@
-"use strict";
-
-const _ = require("lodash");
-const {v4: uuidv4} = require("uuid");
-const IrcFramework = require("irc-framework");
-const Chan = require("./chan");
-const Msg = require("./msg");
-const Prefix = require("./prefix");
-const Helper = require("../helper");
-const Config = require("../config");
-const STSPolicies = require("../plugins/sts");
-const ClientCertificate = require("../plugins/clientCertificate");
-
-module.exports = Network;
-
-/**
- * @type {Object} List of keys which should be sent to the client by default.
- */
-const fieldsForClient = {
-	uuid: true,
-	name: true,
-	nick: true,
-	serverOptions: true,
-};
-
-function Network(attr) {
-	_.defaults(this, attr, {
-		name: "",
-		nick: "",
-		host: "",
-		port: 6667,
-		tls: false,
-		userDisconnected: false,
-		rejectUnauthorized: false,
-		password: "",
-		awayMessage: "",
-		commands: [],
-		username: "",
-		realname: "",
-		leaveMessage: "",
-		sasl: "",
-		saslAccount: "",
-		saslPassword: "",
-		channels: [],
-		irc: null,
-		serverOptions: {
-			CHANTYPES: ["#", "&"],
-			PREFIX: new Prefix([
-				{symbol: "!", mode: "Y"},
-				{symbol: "@", mode: "o"},
-				{symbol: "%", mode: "h"},
-				{symbol: "+", mode: "v"},
-			]),
-			NETWORK: "",
-		},
-
-		proxyHost: "",
-		proxyPort: 1080,
-		proxyUsername: "",
-		proxyPassword: "",
-		proxyEnabled: false,
-
-		chanCache: [],
-		ignoreList: [],
-		keepNick: null,
-	});
-
-	if (!this.uuid) {
-		this.uuid = uuidv4();
-	}
-
-	if (!this.name) {
-		this.name = this.host;
-	}
-
-	this.channels.unshift(
-		new Chan({
-			name: this.name,
-			type: Chan.Type.LOBBY,
-			// The lobby only starts as muted if every channel (unless it's special) is muted.
-			// This is A) easier to implement and B) stops some confusion on startup.
-			muted:
-				this.channels.length >= 1 &&
-				this.channels.every((chan) => chan.muted || chan.type === Chan.Type.SPECIAL),
-		})
-	);
-}
-
-Network.prototype.validate = function (client) {
-	// Remove !, :, @ and whitespace characters from nicknames and usernames
-	const cleanNick = (str) => str.replace(/[\x00\s:!@]/g, "_").substring(0, 100);
-
-	// Remove new lines and limit length
-	const cleanString = (str) => str.replace(/[\x00\r\n]/g, "").substring(0, 300);
-
-	this.setNick(cleanNick(String(this.nick || Config.getDefaultNick())));
-
-	if (!this.username) {
-		// If username is empty, make one from the provided nick
-		this.username = this.nick.replace(/[^a-zA-Z0-9]/g, "");
-	}
-
-	this.username = cleanString(this.username) || "thelounge";
-	this.realname = cleanString(this.realname) || "The Lounge User";
-	this.leaveMessage = cleanString(this.leaveMessage);
-	this.password = cleanString(this.password);
-	this.host = cleanString(this.host).toLowerCase();
-	this.name = cleanString(this.name);
-	this.saslAccount = cleanString(this.saslAccount);
-	this.saslPassword = cleanString(this.saslPassword);
-
-	this.proxyHost = cleanString(this.proxyHost);
-	this.proxyPort = this.proxyPort || 1080;
-	this.proxyUsername = cleanString(this.proxyUsername);
-	this.proxyPassword = cleanString(this.proxyPassword);
-	this.proxyEnabled = !!this.proxyEnabled;
-
-	const error = function (network, text) {
-		network.channels[0].pushMessage(
-			client,
-			new Msg({
-				type: Msg.Type.ERROR,
-				text: text,
-			}),
-			true
-		);
-	};
-
-	if (!this.port) {
-		this.port = this.tls ? 6697 : 6667;
-	}
-
-	if (!["", "plain", "external"].includes(this.sasl)) {
-		this.sasl = "";
-	}
-
-	if (Config.values.lockNetwork) {
-		// This check is needed to prevent invalid user configurations
-		if (
-			!Config.values.public &&
-			this.host &&
-			this.host.length > 0 &&
-			this.host !== Config.values.defaults.host
-		) {
-			error(this, `The hostname you specified (${this.host}) is not allowed.`);
-			return false;
-		}
-
-		if (Config.values.public) {
-			this.name = Config.values.defaults.name;
-			// Sync lobby channel name
-			this.channels[0].name = Config.values.defaults.name;
-		}
-
-		this.host = Config.values.defaults.host;
-		this.port = Config.values.defaults.port;
-		this.tls = Config.values.defaults.tls;
-		this.rejectUnauthorized = Config.values.defaults.rejectUnauthorized;
-	}
-
-	if (this.host.length === 0) {
-		error(this, "You must specify a hostname to connect.");
-		return false;
-	}
-
-	const stsPolicy = STSPolicies.get(this.host);
-
-	if (stsPolicy && !this.tls) {
-		error(
-			this,
-			`${this.host} has an active strict transport security policy, will connect to port ${stsPolicy.port} over a secure connection.`
-		);
-
-		this.port = stsPolicy.port;
-		this.tls = true;
-		this.rejectUnauthorized = true;
-	}
-
-	return true;
-};
-
-Network.prototype.createIrcFramework = function (client) {
-	this.irc = new IrcFramework.Client({
-		version: false, // We handle it ourselves
-		outgoing_addr: Config.values.bind,
-		enable_chghost: true,
-		enable_echomessage: true,
-		enable_setname: true,
-		auto_reconnect: true,
-
-		// Exponential backoff maxes out at 300 seconds after 9 reconnects,
-		// it will keep trying for well over an hour (plus the timeouts)
-		auto_reconnect_max_retries: 30,
-	});
-
-	this.setIrcFrameworkOptions(client);
-
-	this.irc.requestCap([
-		"znc.in/self-message", // Legacy echo-message for ZNC
-		"znc.in/playback", // See http://wiki.znc.in/Playback
-	]);
-};
-
-Network.prototype.setIrcFrameworkOptions = function (client) {
-	this.irc.options.host = this.host;
-	this.irc.options.port = this.port;
-	this.irc.options.password = this.password;
-	this.irc.options.nick = this.nick;
-	this.irc.options.username = Config.values.useHexIp
-		? Helper.ip2hex(client.config.browser.ip)
-		: this.username;
-	this.irc.options.gecos = this.realname;
-	this.irc.options.tls = this.tls;
-	this.irc.options.rejectUnauthorized = this.rejectUnauthorized;
-	this.irc.options.webirc = this.createWebIrc(client);
-	this.irc.options.client_certificate = null;
-
-	if (this.proxyEnabled) {
-		this.irc.options.socks = {
-			host: this.proxyHost,
-			port: this.proxyPort,
-			user: this.proxyUsername,
-			pass: this.proxyPassword,
-		};
-	} else {
-		delete this.irc.options.socks;
-	}
-
-	if (!this.sasl) {
-		delete this.irc.options.sasl_mechanism;
-		delete this.irc.options.account;
-	} else if (this.sasl === "external") {
-		this.irc.options.sasl_mechanism = "EXTERNAL";
-		this.irc.options.account = {};
-		this.irc.options.client_certificate = ClientCertificate.get(this.uuid);
-	} else if (this.sasl === "plain") {
-		delete this.irc.options.sasl_mechanism;
-		this.irc.options.account = {
-			account: this.saslAccount,
-			password: this.saslPassword,
-		};
-	}
-};
-
-Network.prototype.createWebIrc = function (client) {
-	if (
-		!Config.values.webirc ||
-		!Object.prototype.hasOwnProperty.call(Config.values.webirc, this.host)
-	) {
-		return null;
-	}
-
-	const webircObject = {
-		password: Config.values.webirc[this.host],
-		username: "thelounge",
-		address: client.config.browser.ip,
-		hostname: client.config.browser.hostname,
-	};
-
-	// https://ircv3.net/specs/extensions/webirc#options
-	if (client.config.browser.isSecure) {
-		webircObject.options = {
-			secure: true,
-		};
-	}
-
-	if (typeof Config.values.webirc[this.host] === "function") {
-		webircObject.password = null;
-		return Config.values.webirc[this.host](webircObject, this);
-	}
-
-	return webircObject;
-};
-
-Network.prototype.edit = function (client, args) {
-	const oldNetworkName = this.name;
-	const oldNick = this.nick;
-	const oldRealname = this.realname;
-
-	this.keepNick = null;
-	this.nick = args.nick;
-	this.host = String(args.host || "");
-	this.name = String(args.name || "") || this.host;
-	this.port = parseInt(args.port, 10);
-	this.tls = !!args.tls;
-	this.rejectUnauthorized = !!args.rejectUnauthorized;
-	this.password = String(args.password || "");
-	this.username = String(args.username || "");
-	this.realname = String(args.realname || "");
-	this.leaveMessage = String(args.leaveMessage || "");
-	this.sasl = String(args.sasl || "");
-	this.saslAccount = String(args.saslAccount || "");
-	this.saslPassword = String(args.saslPassword || "");
-
-	this.proxyHost = String(args.proxyHost || "");
-	this.proxyPort = parseInt(args.proxyPort, 10);
-	this.proxyUsername = String(args.proxyUsername || "");
-	this.proxyPassword = String(args.proxyPassword || "");
-	this.proxyEnabled = !!args.proxyEnabled;
-
-	// Split commands into an array
-	this.commands = String(args.commands || "")
-		.replace(/\r\n|\r|\n/g, "\n")
-		.split("\n")
-		.filter((command) => command.length > 0);
-
-	// Sync lobby channel name
-	this.channels[0].name = this.name;
-
-	if (this.name !== oldNetworkName) {
-		// Send updated network name to all connected clients
-		client.emit("network:name", {
-			uuid: this.uuid,
-			name: this.name,
-		});
-	}
-
-	if (!this.validate(client)) {
-		return;
-	}
-
-	if (this.irc) {
-		const connected = this.irc.connection && this.irc.connection.connected;
-
-		if (this.nick !== oldNick) {
-			if (connected) {
-				// Send new nick straight away
-				this.irc.changeNick(this.nick);
-			} else {
-				this.irc.user.nick = this.nick;
-
-				// Update UI nick straight away if IRC is not connected
-				client.emit("nick", {
-					network: this.uuid,
-					nick: this.nick,
-				});
-			}
-		}
-
-		if (
-			connected &&
-			this.realname !== oldRealname &&
-			this.irc.network.cap.isEnabled("setname")
-		) {
-			this.irc.raw("SETNAME", this.realname);
-		}
-
-		this.setIrcFrameworkOptions(client);
-
-		this.irc.user.username = this.irc.options.username;
-		this.irc.user.gecos = this.irc.options.gecos;
-	}
-
-	client.save();
-};
-
-Network.prototype.destroy = function () {
-	this.channels.forEach((channel) => channel.destroy());
-};
-
-Network.prototype.setNick = function (nick) {
-	this.nick = nick;
-	this.highlightRegex = new RegExp(
-		// Do not match characters and numbers (unless IRC color)
-		"(?:^|[^a-z0-9]|\x03[0-9]{1,2})" +
-			// Escape nickname, as it may contain regex stuff
-			_.escapeRegExp(nick) +
-			// Do not match characters and numbers
-			"(?:[^a-z0-9]|$)",
-
-		// Case insensitive search
-		"i"
-	);
-
-	if (this.keepNick === nick) {
-		this.keepNick = null;
-	}
-
-	if (this.irc) {
-		this.irc.options.nick = nick;
-	}
-};
-
-/**
- * Get a clean clone of this network that will be sent to the client.
- * This function performs manual cloning of network object for
- * better control of performance and memory usage.
- *
- * Both of the parameters that are accepted by this function are passed into channels' getFilteredClone call.
- *
- * @see {@link Chan#getFilteredClone}
- */
-Network.prototype.getFilteredClone = function (lastActiveChannel, lastMessage) {
-	const filteredNetwork = Object.keys(this).reduce((newNetwork, prop) => {
-		if (prop === "channels") {
-			// Channels objects perform their own cloning
-			newNetwork[prop] = this[prop].map((channel) =>
-				channel.getFilteredClone(lastActiveChannel, lastMessage)
-			);
-		} else if (fieldsForClient[prop]) {
-			// Some properties that are not useful for the client are skipped
-			newNetwork[prop] = this[prop];
-		}
-
-		return newNetwork;
-	}, {});
-
-	filteredNetwork.status = this.getNetworkStatus();
-
-	return filteredNetwork;
-};
-
-Network.prototype.getNetworkStatus = function () {
-	const status = {
-		connected: false,
-		secure: false,
-	};
-
-	if (this.irc && this.irc.connection && this.irc.connection.transport) {
-		const transport = this.irc.connection.transport;
-
-		if (transport.socket) {
-			const isLocalhost = transport.socket.remoteAddress === "127.0.0.1";
-			const isAuthorized = transport.socket.encrypted && transport.socket.authorized;
-
-			status.connected = transport.isConnected();
-			status.secure = isAuthorized || isLocalhost;
-		}
-	}
-
-	return status;
-};
-
-Network.prototype.addChannel = function (newChan) {
-	let index = this.channels.length; // Default to putting as the last item in the array
-
-	// Don't sort special channels in amongst channels/users.
-	if (newChan.type === Chan.Type.CHANNEL || newChan.type === Chan.Type.QUERY) {
-		// We start at 1 so we don't test against the lobby
-		for (let i = 1; i < this.channels.length; i++) {
-			const compareChan = this.channels[i];
-
-			// Negative if the new chan is alphabetically before the next chan in the list, positive if after
-			if (
-				newChan.name.localeCompare(compareChan.name, {sensitivity: "base"}) <= 0 ||
-				(compareChan.type !== Chan.Type.CHANNEL && compareChan.type !== Chan.Type.QUERY)
-			) {
-				index = i;
-				break;
-			}
-		}
-	}
-
-	this.channels.splice(index, 0, newChan);
-	return index;
-};
-
-Network.prototype.quit = function (quitMessage) {
-	if (!this.irc) {
-		return;
-	}
-
-	// https://ircv3.net/specs/extensions/sts#rescheduling-expiry-on-disconnect
-	STSPolicies.refreshExpiration(this.host);
-
-	this.irc.quit(quitMessage || this.leaveMessage || Config.values.leaveMessage);
-};
-
-Network.prototype.exportForEdit = function () {
-	const fieldsToReturn = [
-		"uuid",
-		"name",
-		"nick",
-		"password",
-		"username",
-		"realname",
-		"leaveMessage",
-		"sasl",
-		"saslAccount",
-		"saslPassword",
-		"commands",
-
-		"proxyEnabled",
-		"proxyHost",
-		"proxyPort",
-		"proxyUsername",
-		"proxyPassword",
-	];
-
-	if (!Config.values.lockNetwork) {
-		fieldsToReturn.push("host");
-		fieldsToReturn.push("port");
-		fieldsToReturn.push("tls");
-		fieldsToReturn.push("rejectUnauthorized");
-	}
-
-	const data = _.pick(this, fieldsToReturn);
-
-	data.hasSTSPolicy = !!STSPolicies.get(this.host);
-
-	return data;
-};
-
-Network.prototype.export = function () {
-	const network = _.pick(this, [
-		"uuid",
-		"awayMessage",
-		"nick",
-		"name",
-		"host",
-		"port",
-		"tls",
-		"userDisconnected",
-		"rejectUnauthorized",
-		"password",
-		"username",
-		"realname",
-		"leaveMessage",
-		"sasl",
-		"saslAccount",
-		"saslPassword",
-		"commands",
-		"ignoreList",
-
-		"proxyHost",
-		"proxyPort",
-		"proxyUsername",
-		"proxyEnabled",
-		"proxyPassword",
-	]);
-
-	network.channels = this.channels
-		.filter(function (channel) {
-			return channel.type === Chan.Type.CHANNEL || channel.type === Chan.Type.QUERY;
-		})
-		.map(function (chan) {
-			const keys = ["name", "muted"];
-
-			if (chan.type === Chan.Type.CHANNEL) {
-				keys.push("key");
-			} else if (chan.type === Chan.Type.QUERY) {
-				keys.push("type");
-			}
-
-			return _.pick(chan, keys);
-		});
-
-	return network;
-};
-
-Network.prototype.getChannel = function (name) {
-	name = name.toLowerCase();
-
-	return _.find(this.channels, function (that, i) {
-		// Skip network lobby (it's always unshifted into first position)
-		return i > 0 && that.name.toLowerCase() === name;
-	});
-};
diff --git a/src/models/user.js b/src/models/user.js
deleted file mode 100644
index dee1e9d0..00000000
--- a/src/models/user.js
+++ /dev/null
@@ -1,35 +0,0 @@
-"use strict";
-
-const _ = require("lodash");
-
-module.exports = User;
-
-function User(attr, prefix) {
-	_.defaults(this, attr, {
-		modes: [],
-		away: "",
-		nick: "",
-		lastMessage: 0,
-	});
-
-	Object.defineProperty(this, "mode", {
-		get() {
-			return this.modes[0] || "";
-		},
-	});
-
-	this.setModes(this.modes, prefix);
-}
-
-User.prototype.setModes = function (modes, prefix) {
-	// irc-framework sets character mode, but The Lounge works with symbols
-	this.modes = modes.map((mode) => prefix.modeToSymbol[mode]);
-};
-
-User.prototype.toJSON = function () {
-	return {
-		nick: this.nick,
-		modes: this.modes,
-		lastMessage: this.lastMessage,
-	};
-};
diff --git a/src/plugins/auth.js b/src/plugins/auth.js
deleted file mode 100644
index 6e951010..00000000
--- a/src/plugins/auth.js
+++ /dev/null
@@ -1,50 +0,0 @@
-"use strict";
-
-const log = require("../log");
-const colors = require("chalk");
-
-// The order defines priority: the first available plugin is used.
-// Always keep 'local' auth plugin at the end of the list; it should always be enabled.
-const plugins = [require("./auth/ldap"), require("./auth/local")];
-
-function unimplemented(funcName) {
-	log.debug(
-		`Auth module ${colors.bold(
-			module.exports.moduleName
-		)} doesn't implement function ${colors.bold(funcName)}`
-	);
-}
-
-// Default API implementations
-module.exports = {
-	moduleName: "<module with no name>",
-
-	// Must override: implements authentication mechanism
-	auth: () => unimplemented("auth"),
-
-	// Optional to override: implements filter for loading users at start up
-	// This allows an auth plugin to check if a user is still acceptable, if the plugin
-	// can do so without access to the user's unhashed password.
-	// Returning 'false' triggers fallback to default behaviour of loading all users
-	loadUsers: () => false,
-};
-
-// local auth should always be enabled, but check here to verify
-let somethingEnabled = false;
-
-// Override default API stubs with exports from first enabled plugin found
-for (const plugin of plugins) {
-	if (plugin.isEnabled()) {
-		somethingEnabled = true;
-
-		for (const name in plugin) {
-			module.exports[name] = plugin[name];
-		}
-
-		break;
-	}
-}
-
-if (!somethingEnabled) {
-	log.error("None of the auth plugins is enabled");
-}
diff --git a/src/plugins/dev-server.js b/src/plugins/dev-server.js
deleted file mode 100644
index e1c5e48c..00000000
--- a/src/plugins/dev-server.js
+++ /dev/null
@@ -1,28 +0,0 @@
-"use strict";
-
-module.exports = (app) => {
-	const log = require("../log");
-
-	log.debug("Starting server in development mode");
-
-	const webpack = require("webpack");
-	const webpackConfig = require("../../webpack.config.js")(undefined, {mode: "production"});
-
-	webpackConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
-	webpackConfig.entry["js/bundle.js"].push(
-		"webpack-hot-middleware/client?path=storage/__webpack_hmr"
-	);
-
-	const compiler = webpack(webpackConfig);
-
-	app.use(
-		require("webpack-dev-middleware")(compiler, {
-			index: "/",
-			publicPath: webpackConfig.output.publicPath,
-		})
-	).use(
-		require("webpack-hot-middleware")(compiler, {
-			path: "/storage/__webpack_hmr",
-		})
-	);
-};
diff --git a/src/plugins/inputs/ctcp.js b/src/plugins/inputs/ctcp.js
deleted file mode 100644
index ed263a9a..00000000
--- a/src/plugins/inputs/ctcp.js
+++ /dev/null
@@ -1,29 +0,0 @@
-"use strict";
-
-const Msg = require("../../models/msg");
-
-exports.commands = ["ctcp"];
-
-exports.input = function ({irc}, chan, cmd, args) {
-	if (args.length < 2) {
-		chan.pushMessage(
-			this,
-			new Msg({
-				type: Msg.Type.ERROR,
-				text: "Usage: /ctcp <nick> <ctcp_type>",
-			})
-		);
-		return;
-	}
-
-	chan.pushMessage(
-		this,
-		new Msg({
-			type: Msg.Type.CTCP_REQUEST,
-			ctcpMessage: `"${args.slice(1).join(" ")}" to ${args[0]}`,
-			from: chan.getUser(irc.user.nick),
-		})
-	);
-
-	irc.ctcpRequest(...args);
-};
diff --git a/src/plugins/inputs/disconnect.js b/src/plugins/inputs/disconnect.js
deleted file mode 100644
index 7b94b925..00000000
--- a/src/plugins/inputs/disconnect.js
+++ /dev/null
@@ -1,13 +0,0 @@
-"use strict";
-
-exports.commands = ["disconnect"];
-exports.allowDisconnected = true;
-
-exports.input = function (network, chan, cmd, args) {
-	const quitMessage = args[0] ? args.join(" ") : null;
-
-	network.quit(quitMessage);
-	network.userDisconnected = true;
-
-	this.save();
-};
diff --git a/src/plugins/inputs/index.js b/src/plugins/inputs/index.js
deleted file mode 100644
index 50a2dc03..00000000
--- a/src/plugins/inputs/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-const clientSideCommands = ["/collapse", "/expand", "/search"];
-
-const passThroughCommands = [
-	"/as",
-	"/bs",
-	"/cs",
-	"/ho",
-	"/hs",
-	"/join",
-	"/ms",
-	"/ns",
-	"/os",
-	"/rs",
-];
-
-const userInputs = [
-	"action",
-	"away",
-	"ban",
-	"connect",
-	"ctcp",
-	"disconnect",
-	"ignore",
-	"invite",
-	"kick",
-	"kill",
-	"list",
-	"mode",
-	"msg",
-	"nick",
-	"notice",
-	"part",
-	"quit",
-	"raw",
-	"rejoin",
-	"topic",
-	"whois",
-	"mute",
-].reduce(function (plugins, name) {
-	const plugin = require(`./${name}`);
-	plugin.commands.forEach((command) => plugins.set(command, plugin));
-	return plugins;
-}, new Map());
-
-const pluginCommands = new Map();
-
-const getCommands = () =>
-	Array.from(userInputs.keys())
-		.concat(Array.from(pluginCommands.keys()))
-		.map((command) => `/${command}`)
-		.concat(clientSideCommands)
-		.concat(passThroughCommands)
-		.sort();
-
-const addPluginCommand = (packageInfo, command, func) => {
-	func.packageInfo = packageInfo;
-	pluginCommands.set(command, func);
-};
-
-module.exports = {
-	addPluginCommand,
-	getCommands,
-	pluginCommands,
-	userInputs,
-};
diff --git a/src/plugins/inputs/kick.js b/src/plugins/inputs/kick.js
deleted file mode 100644
index e8307a74..00000000
--- a/src/plugins/inputs/kick.js
+++ /dev/null
@@ -1,26 +0,0 @@
-"use strict";
-
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
-
-exports.commands = ["kick"];
-
-exports.input = function ({irc}, chan, cmd, args) {
-	if (chan.type !== Chan.Type.CHANNEL) {
-		chan.pushMessage(
-			this,
-			new Msg({
-				type: Msg.Type.ERROR,
-				text: `${cmd} command can only be used in channels.`,
-			})
-		);
-
-		return;
-	}
-
-	if (args.length !== 0) {
-		irc.raw("KICK", chan.name, args[0], args.slice(1).join(" "));
-	}
-
-	return true;
-};
diff --git a/src/plugins/inputs/kill.js b/src/plugins/inputs/kill.js
deleted file mode 100644
index 38423948..00000000
--- a/src/plugins/inputs/kill.js
+++ /dev/null
@@ -1,11 +0,0 @@
-"use strict";
-
-exports.commands = ["kill"];
-
-exports.input = function ({irc}, chan, cmd, args) {
-	if (args.length !== 0) {
-		irc.raw("KILL", args[0], args.slice(1).join(" "));
-	}
-
-	return true;
-};
diff --git a/src/plugins/inputs/list.js b/src/plugins/inputs/list.js
deleted file mode 100644
index 220c0069..00000000
--- a/src/plugins/inputs/list.js
+++ /dev/null
@@ -1,9 +0,0 @@
-"use strict";
-
-exports.commands = ["list"];
-
-exports.input = function (network, chan, cmd, args) {
-	network.chanCache = [];
-	network.irc.list(...args);
-	return true;
-};
diff --git a/src/plugins/inputs/quit.js b/src/plugins/inputs/quit.js
deleted file mode 100644
index 0d10ced1..00000000
--- a/src/plugins/inputs/quit.js
+++ /dev/null
@@ -1,25 +0,0 @@
-"use strict";
-
-const _ = require("lodash");
-const ClientCertificate = require("../clientCertificate");
-
-exports.commands = ["quit"];
-exports.allowDisconnected = true;
-
-exports.input = function (network, chan, cmd, args) {
-	const client = this;
-
-	client.networks = _.without(client.networks, network);
-	network.destroy();
-	client.save();
-	client.emit("quit", {
-		network: network.uuid,
-	});
-
-	const quitMessage = args[0] ? args.join(" ") : null;
-	network.quit(quitMessage);
-
-	ClientCertificate.remove(network.uuid);
-
-	return true;
-};
diff --git a/src/plugins/inputs/raw.js b/src/plugins/inputs/raw.js
deleted file mode 100644
index 816cfaae..00000000
--- a/src/plugins/inputs/raw.js
+++ /dev/null
@@ -1,11 +0,0 @@
-"use strict";
-
-exports.commands = ["raw", "send", "quote"];
-
-exports.input = function ({irc}, chan, cmd, args) {
-	if (args.length !== 0) {
-		irc.connection.write(args.join(" "));
-	}
-
-	return true;
-};
diff --git a/src/plugins/inputs/rejoin.js b/src/plugins/inputs/rejoin.js
deleted file mode 100644
index 1b215733..00000000
--- a/src/plugins/inputs/rejoin.js
+++ /dev/null
@@ -1,24 +0,0 @@
-"use strict";
-
-const Msg = require("../../models/msg");
-const Chan = require("../../models/chan");
-
-exports.commands = ["cycle", "rejoin"];
-
-exports.input = function ({irc}, chan) {
-	if (chan.type !== Chan.Type.CHANNEL) {
-		chan.pushMessage(
-			this,
-			new Msg({
-				type: Msg.Type.ERROR,
-				text: "You can only rejoin channels.",
-			})
-		);
-		return;
-	}
-
-	irc.part(chan.name, "Rejoining");
-	irc.join(chan.name);
-
-	return true;
-};
diff --git a/src/plugins/inputs/topic.js b/src/plugins/inputs/topic.js
deleted file mode 100644
index a26b8106..00000000
--- a/src/plugins/inputs/topic.js
+++ /dev/null
@@ -1,23 +0,0 @@
-"use strict";
-
-const Chan = require("../../models/chan");
-const Msg = require("../../models/msg");
-
-exports.commands = ["topic"];
-
-exports.input = function ({irc}, chan, cmd, args) {
-	if (chan.type !== Chan.Type.CHANNEL) {
-		chan.pushMessage(
-			this,
-			new Msg({
-				type: Msg.Type.ERROR,
-				text: `${cmd} command can only be used in channels.`,
-			})
-		);
-
-		return;
-	}
-
-	irc.setTopic(chan.name, args.join(" "));
-	return true;
-};
diff --git a/test/.mocharc.yml b/test/.mocharc.yml
index 9a82dd1b..5934e4b4 100644
--- a/test/.mocharc.yml
+++ b/test/.mocharc.yml
@@ -3,6 +3,13 @@ check-leaks: true
 recursive: true
 reporter: dot
 interactive: false
-spec: "test/**/*.js"
+spec: "test/**/*.ts"
 ignore: "test/client/**"
-require: "test/fixtures/env"
+extension: ["ts", "js"]
+require:
+  - "ts-node/register"
+  # - "jsdom-global/register"
+  - "test/fixtures/env.ts"
+globals:
+  - "__VUE_PROD_DEVTOOLS__"
+  - "__VUE__"
diff --git a/test/.nycrc-mocha.json b/test/.nycrc-mocha.json
index a1891363..39017743 100644
--- a/test/.nycrc-mocha.json
+++ b/test/.nycrc-mocha.json
@@ -1,9 +1,10 @@
 {
+  "extends": "@istanbuljs/nyc-config-typescript",
   "all": true,
   "instrument": true,
   "temp-dir": "./node_modules/.cache/nyc_output",
-  "exclude": ["webpack.config*.js"],
-  "include": ["defaults", "src", "*.js"],
+  "exclude": ["webpack.config*.ts", "server/dist", "dist"],
+  "include": ["defaults", "server", "*.ts"],
   "reporter": ["json", "text-summary"],
   "clean": false
 }
diff --git a/test/client/components/ParsedMessageTestWrapper.vue b/test/client/components/ParsedMessageTestWrapper.vue
index 552e9c59..0e1a3355 100644
--- a/test/client/components/ParsedMessageTestWrapper.vue
+++ b/test/client/components/ParsedMessageTestWrapper.vue
@@ -4,18 +4,20 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
 import ParsedMessage from "../../../client/components/ParsedMessage.vue";
+import {defineComponent, PropType} from "vue";
+import {ClientMessage, ClientNetwork} from "../../../client/js/types";
 
-export default {
+export default defineComponent({
 	name: "ParsedMessageTestWrapper",
 	components: {
 		ParsedMessage,
 	},
 	props: {
 		text: String,
-		message: Object,
-		network: Object,
+		message: {type: Object as PropType<ClientMessage>},
+		network: {type: Object as PropType<ClientNetwork>, required: true},
 	},
-};
+});
 </script>
diff --git a/test/client/index.js b/test/client/index.ts
similarity index 55%
rename from test/client/index.js
rename to test/client/index.ts
index c13b294e..7ea13839 100644
--- a/test/client/index.js
+++ b/test/client/index.ts
@@ -1,6 +1,5 @@
-"use strict";
-
 // Recursively load all JS files (test files) in the `js` folder
+// @ts-expect-error ts-migrate(2339) FIXME: Property 'context' does not exist on type 'NodeReq... Remove this comment to see the full error message
 const context = require.context("./js", true, /.+\.js$/);
 context.keys().forEach(context);
 
diff --git a/test/client/js/authTest.js b/test/client/js/authTest.js
deleted file mode 100644
index c55eb880..00000000
--- a/test/client/js/authTest.js
+++ /dev/null
@@ -1,31 +0,0 @@
-"use strict";
-
-const expect = require("chai").expect;
-const stub = require("sinon").stub;
-const Auth = require("../../../client/js/auth").default;
-const localStorage = require("../../../client/js/localStorage").default;
-const location = require("../../../client/js/location").default;
-
-describe("Auth", function () {
-	describe(".signout", function () {
-		beforeEach(function () {
-			stub(localStorage, "clear");
-			stub(location, "reload");
-		});
-
-		afterEach(function () {
-			localStorage.clear.restore();
-			location.reload.restore();
-		});
-
-		it("should empty the local storage", function () {
-			Auth.signout();
-			expect(localStorage.clear.calledOnce).to.be.true;
-		});
-
-		it("should reload the page", function () {
-			Auth.signout();
-			expect(location.reload.calledOnce).to.be.true;
-		});
-	});
-});
diff --git a/test/client/js/authTest.ts b/test/client/js/authTest.ts
new file mode 100644
index 00000000..eacb53b6
--- /dev/null
+++ b/test/client/js/authTest.ts
@@ -0,0 +1,34 @@
+import {expect} from "chai";
+import sinon from "ts-sinon";
+import Auth from "../../../client/js/auth";
+import localStorage from "../../../client/js/localStorage";
+import location from "../../../client/js/location";
+
+describe("Auth", function () {
+	describe(".signout", function () {
+		let localStorageClearStub: sinon.SinonStub<[], void>;
+		let locationReloadStub: sinon.SinonStub<[], void>;
+
+		beforeEach(function () {
+			localStorageClearStub = sinon.stub(localStorage, "clear");
+			locationReloadStub = sinon.stub(location, "reload");
+		});
+
+		afterEach(function () {
+			localStorageClearStub.restore();
+			locationReloadStub.restore();
+		});
+
+		it("should empty the local storage", function () {
+			Auth.signout();
+			// @ts-expect-error ts-migrate(2339) FIXME: Property 'calledOnce' does not exist on type '() =... Remove this comment to see the full error message
+			expect(localStorage.clear.calledOnce).to.be.true;
+		});
+
+		it("should reload the page", function () {
+			Auth.signout();
+			// @ts-expect-error ts-migrate(2339) FIXME: Property 'calledOnce' does not exist on type '{ ()... Remove this comment to see the full error message
+			expect(location.reload.calledOnce).to.be.true;
+		});
+	});
+});
diff --git a/test/client/js/constantsTest.js b/test/client/js/constantsTest.ts
similarity index 83%
rename from test/client/js/constantsTest.js
rename to test/client/js/constantsTest.ts
index ecf2730b..04daa314 100644
--- a/test/client/js/constantsTest.js
+++ b/test/client/js/constantsTest.ts
@@ -1,7 +1,6 @@
-"use strict";
-
-const expect = require("chai").expect;
-const constants = require("../../../client/js/constants");
+import {expect} from "chai";
+import constants from "../../../client/js/constants";
+import {describe} from "mocha";
 
 describe("client-side constants", function () {
 	describe(".colorCodeMap", function () {
@@ -25,6 +24,7 @@ describe("client-side constants", function () {
 		});
 
 		it("should only contain ASCII strings", function () {
+			// @ts-expect-error ts-migrate(7006) FIXME: Parameter 'type' implicitly has an 'any' type.
 			constants.condensedTypes.forEach((type) => {
 				expect(type).to.be.a("string").that.does.match(/^\w+$/);
 			});
diff --git a/test/client/js/helpers/friendlysizeTest.js b/test/client/js/helpers/friendlysizeTest.ts
similarity index 86%
rename from test/client/js/helpers/friendlysizeTest.js
rename to test/client/js/helpers/friendlysizeTest.ts
index 6cc5a183..52d43e88 100644
--- a/test/client/js/helpers/friendlysizeTest.js
+++ b/test/client/js/helpers/friendlysizeTest.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const friendlysize = require("../../../../client/js/helpers/friendlysize").default;
+import {expect} from "chai";
+import friendlysize from "../../../../client/js/helpers/friendlysize";
 
 describe("friendlysize helper", function () {
 	it("should render human-readable version", function () {
diff --git a/test/client/js/helpers/ircmessageparser/anyIntersection.js b/test/client/js/helpers/ircmessageparser/anyIntersection.ts
similarity index 80%
rename from test/client/js/helpers/ircmessageparser/anyIntersection.js
rename to test/client/js/helpers/ircmessageparser/anyIntersection.ts
index a5c68afa..15cb054f 100644
--- a/test/client/js/helpers/ircmessageparser/anyIntersection.js
+++ b/test/client/js/helpers/ircmessageparser/anyIntersection.ts
@@ -1,8 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const anyIntersection =
-	require("../../../../../client/js/helpers/ircmessageparser/anyIntersection").default;
+import {expect} from "chai";
+import anyIntersection from "../../../../../client/js/helpers/ircmessageparser/anyIntersection";
 
 describe("anyIntersection", () => {
 	it("should not intersect on edges", () => {
diff --git a/test/client/js/helpers/ircmessageparser/cleanIrcMessage.js b/test/client/js/helpers/ircmessageparser/cleanIrcMessage.ts
similarity index 91%
rename from test/client/js/helpers/ircmessageparser/cleanIrcMessage.js
rename to test/client/js/helpers/ircmessageparser/cleanIrcMessage.ts
index 056c039d..4abe23a2 100644
--- a/test/client/js/helpers/ircmessageparser/cleanIrcMessage.js
+++ b/test/client/js/helpers/ircmessageparser/cleanIrcMessage.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const cleanIrcMessage = require("../../../../../client/js/helpers/ircmessageparser/cleanIrcMessage");
+import {expect} from "chai";
+import cleanIrcMessage from "../../../../../client/js/helpers/ircmessageparser/cleanIrcMessage";
 
 describe("cleanIrcMessage", function () {
 	it("should remove all formatting", function () {
diff --git a/test/client/js/helpers/ircmessageparser/fill.js b/test/client/js/helpers/ircmessageparser/fill.ts
similarity index 86%
rename from test/client/js/helpers/ircmessageparser/fill.js
rename to test/client/js/helpers/ircmessageparser/fill.ts
index 82ffcf4a..57c90b53 100644
--- a/test/client/js/helpers/ircmessageparser/fill.js
+++ b/test/client/js/helpers/ircmessageparser/fill.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const fill = require("../../../../../client/js/helpers/ircmessageparser/fill").default;
+import {expect} from "chai";
+import fill from "../../../../../client/js/helpers/ircmessageparser/fill";
 
 describe("fill", () => {
 	const text = "01234567890123456789";
diff --git a/test/client/js/helpers/ircmessageparser/findChannels.js b/test/client/js/helpers/ircmessageparser/findChannels.ts
similarity index 93%
rename from test/client/js/helpers/ircmessageparser/findChannels.js
rename to test/client/js/helpers/ircmessageparser/findChannels.ts
index 7d1f71db..7fed830b 100644
--- a/test/client/js/helpers/ircmessageparser/findChannels.js
+++ b/test/client/js/helpers/ircmessageparser/findChannels.ts
@@ -1,8 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const findChannels =
-	require("../../../../../client/js/helpers/ircmessageparser/findChannels").default;
+import {expect} from "chai";
+import findChannels from "../../../../../client/js/helpers/ircmessageparser/findChannels";
 
 describe("findChannels", () => {
 	it("should find single letter channel", () => {
diff --git a/test/client/js/helpers/ircmessageparser/findEmoji.js b/test/client/js/helpers/ircmessageparser/findEmoji.ts
similarity index 88%
rename from test/client/js/helpers/ircmessageparser/findEmoji.js
rename to test/client/js/helpers/ircmessageparser/findEmoji.ts
index 95d5370f..f37f9519 100644
--- a/test/client/js/helpers/ircmessageparser/findEmoji.js
+++ b/test/client/js/helpers/ircmessageparser/findEmoji.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const findEmoji = require("../../../../../client/js/helpers/ircmessageparser/findEmoji").default;
+import {expect} from "chai";
+import findEmoji from "../../../../../client/js/helpers/ircmessageparser/findEmoji";
 
 describe("findEmoji", () => {
 	it("should find default emoji presentation character", () => {
diff --git a/test/client/js/helpers/ircmessageparser/findLinks.js b/test/client/js/helpers/ircmessageparser/findLinks.ts
similarity index 98%
rename from test/client/js/helpers/ircmessageparser/findLinks.js
rename to test/client/js/helpers/ircmessageparser/findLinks.ts
index 3f0c1ece..350830b2 100644
--- a/test/client/js/helpers/ircmessageparser/findLinks.js
+++ b/test/client/js/helpers/ircmessageparser/findLinks.ts
@@ -1,10 +1,8 @@
-"use strict";
-
-const expect = require("chai").expect;
-const {
+import {expect} from "chai";
+import {
 	findLinks,
 	findLinksWithSchema,
-} = require("../../../../../client/js/helpers/ircmessageparser/findLinks");
+} from "../../../../../client/js/helpers/ircmessageparser/findLinks";
 
 describe("findLinks", () => {
 	it("should find url", () => {
diff --git a/test/client/js/helpers/ircmessageparser/findNames.js b/test/client/js/helpers/ircmessageparser/findNames.ts
similarity index 90%
rename from test/client/js/helpers/ircmessageparser/findNames.js
rename to test/client/js/helpers/ircmessageparser/findNames.ts
index 7ce52655..d000407c 100644
--- a/test/client/js/helpers/ircmessageparser/findNames.js
+++ b/test/client/js/helpers/ircmessageparser/findNames.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const findNames = require("../../../../../client/js/helpers/ircmessageparser/findNames").default;
+import {expect} from "chai";
+import findNames from "../../../../../client/js/helpers/ircmessageparser/findNames";
 
 describe("findNames", () => {
 	it("should find nicks in text", () => {
diff --git a/test/client/js/helpers/ircmessageparser/merge.js b/test/client/js/helpers/ircmessageparser/merge.ts
similarity index 94%
rename from test/client/js/helpers/ircmessageparser/merge.js
rename to test/client/js/helpers/ircmessageparser/merge.ts
index 18ac32bc..58191832 100644
--- a/test/client/js/helpers/ircmessageparser/merge.js
+++ b/test/client/js/helpers/ircmessageparser/merge.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const merge = require("../../../../../client/js/helpers/ircmessageparser/merge").default;
+import {expect} from "chai";
+import merge from "../../../../../client/js/helpers/ircmessageparser/merge";
 
 describe("merge", () => {
 	it("should split style information", () => {
@@ -73,7 +71,7 @@ describe("merge", () => {
 		];
 
 		const actual = merge(
-			textParts,
+			textParts as any,
 			styleFragments,
 			styleFragments.map((fragment) => fragment.text).join("")
 		);
diff --git a/test/client/js/helpers/ircmessageparser/parseStyle.js b/test/client/js/helpers/ircmessageparser/parseStyle.ts
similarity index 99%
rename from test/client/js/helpers/ircmessageparser/parseStyle.js
rename to test/client/js/helpers/ircmessageparser/parseStyle.ts
index 45d75c5c..a79a1e6f 100644
--- a/test/client/js/helpers/ircmessageparser/parseStyle.js
+++ b/test/client/js/helpers/ircmessageparser/parseStyle.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const parseStyle = require("../../../../../client/js/helpers/ircmessageparser/parseStyle").default;
+import {expect} from "chai";
+import parseStyle from "../../../../../client/js/helpers/ircmessageparser/parseStyle";
 
 describe("parseStyle", () => {
 	it("should replace control codes", () => {
diff --git a/test/client/js/helpers/localetimeTest.js b/test/client/js/helpers/localetimeTest.ts
similarity index 76%
rename from test/client/js/helpers/localetimeTest.js
rename to test/client/js/helpers/localetimeTest.ts
index 589da875..c4e90335 100644
--- a/test/client/js/helpers/localetimeTest.js
+++ b/test/client/js/helpers/localetimeTest.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const localetime = require("../../../../client/js/helpers/localetime").default;
+import {expect} from "chai";
+import localetime from "../../../../client/js/helpers/localetime";
 
 describe("localetime helper", () => {
 	it("should render a human-readable date", () => {
diff --git a/test/client/js/helpers/parse.js b/test/client/js/helpers/parse.ts
similarity index 82%
rename from test/client/js/helpers/parse.js
rename to test/client/js/helpers/parse.ts
index 189725d2..1a3f108a 100644
--- a/test/client/js/helpers/parse.js
+++ b/test/client/js/helpers/parse.ts
@@ -1,31 +1,27 @@
-"use strict";
+import {expect} from "chai";
 
-const expect = require("chai").expect;
+import {mount} from "@vue/test-utils";
+import ParsedMessage from "../../../../client/components/ParsedMessage.vue";
+import {ClientMessage} from "../../../../client/js/types";
 
-import {renderToString} from "@vue/server-test-utils";
-import ParsedMessageTestWrapper from "../../components/ParsedMessageTestWrapper.vue";
-
-async function getParsedMessageContents(text, message) {
-	let contents = await renderToString(ParsedMessageTestWrapper, {
-		propsData: {
+function getParsedMessageContents(text: string, message?: any) {
+	const wrapper = mount(ParsedMessage, {
+		props: {
 			text,
 			message,
 		},
 	});
 
-	// The wrapper adds a surrounding div to the message html, so we clean that out here
-	contents = contents.replace(/^<div data-server-rendered="true">([^]+)<\/div>$/m, "$1");
-
-	return contents;
+	return wrapper.html();
 }
 
 describe("IRC formatted message parser", () => {
-	it("should not introduce xss", async () => {
+	it("should not introduce xss", () => {
 		const testCases = [
 			{
 				input: "<img onerror='location.href=\"//youtube.com\"'>",
 				expected:
-					'&lt;img onerror=\'location.href=&quot;<a href="http://youtube.com" dir="auto" target="_blank" rel="noopener">//youtube.com</a>&quot;\'&gt;',
+					'&lt;img onerror=\'location.href="<a href="http://youtube.com" dir="auto" target="_blank" rel="noopener">//youtube.com</a>"\'&gt;',
 			},
 			{
 				input: '#&">bug',
@@ -34,15 +30,13 @@ describe("IRC formatted message parser", () => {
 			},
 		];
 
-		const actual = await Promise.all(
-			testCases.map((testCase) => getParsedMessageContents(testCase.input))
-		);
+		const actual = testCases.map((testCase) => getParsedMessageContents(testCase.input));
 		const expected = testCases.map((testCase) => testCase.expected);
 
 		expect(actual).to.deep.equal(expected);
 	});
 
-	it("should skip all <32 ASCII codes except linefeed", async () => {
+	it("should skip all <32 ASCII codes except linefeed", () => {
 		const testCases = [
 			{
 				input: "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1B\x1D\x1D\x1E\x1Ftext\x0Awithcontrolcodestest",
@@ -51,15 +45,13 @@ describe("IRC formatted message parser", () => {
 			},
 		];
 
-		const actual = await Promise.all(
-			testCases.map((testCase) => getParsedMessageContents(testCase.input))
-		);
+		const actual = testCases.map((testCase) => getParsedMessageContents(testCase.input));
 		const expected = testCases.map((testCase) => testCase.expected);
 
 		expect(actual).to.deep.equal(expected);
 	});
 
-	it("should find urls", async () => {
+	it("should find urls", () => {
 		const testCases = [
 			{
 				input: "irc://irc.example.com/thelounge",
@@ -102,15 +94,13 @@ describe("IRC formatted message parser", () => {
 			},
 		];
 
-		const actual = await Promise.all(
-			testCases.map((testCase) => getParsedMessageContents(testCase.input))
-		);
+		const actual = testCases.map((testCase) => getParsedMessageContents(testCase.input));
 		const expected = testCases.map((testCase) => testCase.expected);
 
 		expect(actual).to.deep.equal(expected);
 	});
 
-	it("url with a dot parsed correctly", async () => {
+	it("url with a dot parsed correctly", () => {
 		const input =
 			"bonuspunkt: your URL parser misparses this URL: https://msdn.microsoft.com/en-us/library/windows/desktop/ms644989(v=vs.85).aspx";
 		const correctResult =
@@ -119,12 +109,12 @@ describe("IRC formatted message parser", () => {
 			"https://msdn.microsoft.com/en-us/library/windows/desktop/ms644989(v=vs.85).aspx" +
 			"</a>";
 
-		const actual = await getParsedMessageContents(input);
+		const actual = getParsedMessageContents(input);
 
 		expect(actual).to.deep.equal(correctResult);
 	});
 
-	it("should balance brackets", async () => {
+	it("should balance brackets", () => {
 		const testCases = [
 			{
 				input: "<https://theos.kyriasis.com/~kyrias/stats/archlinux.html>",
@@ -160,15 +150,13 @@ describe("IRC formatted message parser", () => {
 			},
 		];
 
-		const actual = await Promise.all(
-			testCases.map((testCase) => getParsedMessageContents(testCase.input))
-		);
+		const actual = testCases.map((testCase) => getParsedMessageContents(testCase.input));
 		const expected = testCases.map((testCase) => testCase.expected);
 
 		expect(actual).to.deep.equal(expected);
 	});
 
-	it("should not find urls", async () => {
+	it("should not find urls", () => {
 		const testCases = [
 			{
 				input: "text www. text",
@@ -180,15 +168,13 @@ describe("IRC formatted message parser", () => {
 			},
 		];
 
-		const actual = await Promise.all(
-			testCases.map((testCase) => getParsedMessageContents(testCase.input))
-		);
+		const actual = testCases.map((testCase) => getParsedMessageContents(testCase.input));
 		const expected = testCases.map((testCase) => testCase.expected);
 
 		expect(actual).to.deep.equal(expected);
 	});
 
-	it("should find channels", async () => {
+	it("should find channels", () => {
 		const testCases = [
 			{
 				input: "#a",
@@ -237,15 +223,13 @@ describe("IRC formatted message parser", () => {
 			},
 		];
 
-		const actual = await Promise.all(
-			testCases.map((testCase) => getParsedMessageContents(testCase.input))
-		);
+		const actual = testCases.map((testCase) => getParsedMessageContents(testCase.input));
 		const expected = testCases.map((testCase) => testCase.expected);
 
 		expect(actual).to.deep.equal(expected);
 	});
 
-	it("should not find channels", async () => {
+	it("should not find channels", () => {
 		const testCases = [
 			{
 				input: "hi#test",
@@ -257,9 +241,7 @@ describe("IRC formatted message parser", () => {
 			},
 		];
 
-		const actual = await Promise.all(
-			testCases.map((testCase) => getParsedMessageContents(testCase.input))
-		);
+		const actual = testCases.map((testCase) => getParsedMessageContents(testCase.input));
 		const expected = testCases.map((testCase) => testCase.expected);
 
 		expect(actual).to.deep.equal(expected);
@@ -356,8 +338,8 @@ describe("IRC formatted message parser", () => {
 				'<span class="irc-bold">bold</span>' + " " + '<span class="irc-bold">bold</span>',
 		},
 	].forEach(({name, input, expected}) => {
-		it(`should handle style characters: ${name}`, async () => {
-			expect(await getParsedMessageContents(input)).to.equal(expected);
+		it(`should handle style characters: ${name}`, () => {
+			expect(getParsedMessageContents(input)).to.equal(expected);
 		});
 	});
 
@@ -384,7 +366,7 @@ describe("IRC formatted message parser", () => {
 		expect(actual).to.deep.equal(expected);
 	});
 
-	it("should not find nicks", async () => {
+	it("should not find nicks", () => {
 		const testCases = [
 			{
 				users: ["MaxLeiter, test"],
@@ -404,15 +386,13 @@ describe("IRC formatted message parser", () => {
 			},
 		];
 
-		const actual = await Promise.all(
-			testCases.map((testCase) => getParsedMessageContents(testCase.input))
-		);
+		const actual = testCases.map((testCase) => getParsedMessageContents(testCase.input));
 		const expected = testCases.map((testCase) => testCase.expected);
 
 		expect(actual).to.deep.equal(expected);
 	});
 
-	it("should go bonkers like mirc", async () => {
+	it("should go bonkers like mirc", () => {
 		const testCases = [
 			{
 				input: "\x02irc\x0f://\x1dirc.example.com\x0f/\x034,8thelounge",
@@ -435,9 +415,7 @@ describe("IRC formatted message parser", () => {
 			},
 		];
 
-		const actual = await Promise.all(
-			testCases.map((testCase) => getParsedMessageContents(testCase.input))
-		);
+		const actual = testCases.map((testCase) => getParsedMessageContents(testCase.input));
 		const expected = testCases.map((testCase) => testCase.expected);
 
 		expect(actual).to.deep.equal(expected);
@@ -512,12 +490,12 @@ describe("IRC formatted message parser", () => {
 				'<span dir="auto" role="button" tabindex="0" class="inline-channel">#i❤️thelounge</span>',
 		},
 	].forEach(({name, input, expected}) => {
-		it(`should find emoji: ${name}`, async () => {
-			expect(await getParsedMessageContents(input)).to.equal(expected);
+		it(`should find emoji: ${name}`, () => {
+			expect(getParsedMessageContents(input)).to.equal(expected);
 		});
 	});
 
-	it("should optimize generated html", async () => {
+	it("should optimize generated html", () => {
 		const testCases = [
 			{
 				input: 'test \x0312#\x0312\x0312"te\x0312st\x0312\x0312\x0312\x0312\x0312\x0312\x0312\x0312\x0312\x0312\x0312a',
@@ -529,15 +507,13 @@ describe("IRC formatted message parser", () => {
 			},
 		];
 
-		const actual = await Promise.all(
-			testCases.map((testCase) => getParsedMessageContents(testCase.input))
-		);
+		const actual = testCases.map((testCase) => getParsedMessageContents(testCase.input));
 		const expected = testCases.map((testCase) => testCase.expected);
 
 		expect(actual).to.deep.equal(expected);
 	});
 
-	it("should trim common protocols", async () => {
+	it("should trim common protocols", () => {
 		const testCases = [
 			{
 				input: "like..http://example.com",
@@ -557,15 +533,13 @@ describe("IRC formatted message parser", () => {
 			},
 		];
 
-		const actual = await Promise.all(
-			testCases.map((testCase) => getParsedMessageContents(testCase.input))
-		);
+		const actual = testCases.map((testCase) => getParsedMessageContents(testCase.input));
 		const expected = testCases.map((testCase) => testCase.expected);
 
 		expect(actual).to.deep.equal(expected);
 	});
 
-	it("should not find channel in fragment", async () => {
+	it("should not find channel in fragment", () => {
 		const testCases = [
 			{
 				input: "http://example.com/#hash",
@@ -576,17 +550,15 @@ describe("IRC formatted message parser", () => {
 			},
 		];
 
-		const actual = await Promise.all(
-			testCases.map((testCase) => getParsedMessageContents(testCase.input))
-		);
+		const actual = testCases.map((testCase) => getParsedMessageContents(testCase.input));
 		const expected = testCases.map((testCase) => testCase.expected);
 
 		expect(actual).to.deep.equal(expected);
 	});
 
-	it("should not overlap parts", async () => {
+	it("should not overlap parts", () => {
 		const input = "Url: http://example.com/path Channel: ##channel";
-		const actual = await getParsedMessageContents(input);
+		const actual = getParsedMessageContents(input);
 
 		expect(actual).to.equal(
 			'Url: <a href="http://example.com/path" dir="auto" target="_blank" rel="noopener">http://example.com/path</a> ' +
@@ -594,9 +566,9 @@ describe("IRC formatted message parser", () => {
 		);
 	});
 
-	it("should handle overlapping parts by using first starting", async () => {
+	it("should handle overlapping parts by using first starting", () => {
 		const input = "#test-https://example.com";
-		const actual = await getParsedMessageContents(input);
+		const actual = getParsedMessageContents(input);
 
 		expect(actual).to.equal(
 			'<span dir="auto" role="button" tabindex="0" class="inline-channel">' +
@@ -605,9 +577,9 @@ describe("IRC formatted message parser", () => {
 		);
 	});
 
-	it("should find links separated by tab character", async () => {
+	it("should find links separated by tab character", () => {
 		const input = "example.com\texample.org";
-		const actual = await getParsedMessageContents(input);
+		const actual = getParsedMessageContents(input);
 
 		expect(actual).to.equal(
 			'<a href="http://example.com" dir="auto" target="_blank" rel="noopener">example.com</a>' +
diff --git a/test/client/js/helpers/parseIrcUri.js b/test/client/js/helpers/parseIrcUri.ts
similarity index 94%
rename from test/client/js/helpers/parseIrcUri.js
rename to test/client/js/helpers/parseIrcUri.ts
index af307513..5f977d9d 100644
--- a/test/client/js/helpers/parseIrcUri.js
+++ b/test/client/js/helpers/parseIrcUri.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const parseIrcUri = require("../../../../client/js/helpers/parseIrcUri").default;
+import {expect} from "chai";
+import parseIrcUri from "../../../../client/js/helpers/parseIrcUri";
 
 describe("parseIrcUri helper", function () {
 	it("should parse irc:// without port", function () {
diff --git a/test/client/js/helpers/roundBadgeNumberTest.js b/test/client/js/helpers/roundBadgeNumberTest.ts
similarity index 81%
rename from test/client/js/helpers/roundBadgeNumberTest.js
rename to test/client/js/helpers/roundBadgeNumberTest.ts
index 4e158c18..1b26ee91 100644
--- a/test/client/js/helpers/roundBadgeNumberTest.js
+++ b/test/client/js/helpers/roundBadgeNumberTest.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const roundBadgeNumber = require("../../../../client/js/helpers/roundBadgeNumber").default;
+import {expect} from "chai";
+import roundBadgeNumber from "../../../../client/js/helpers/roundBadgeNumber";
 
 describe("roundBadgeNumber helper", function () {
 	it("should return any number under 1000 as a string", function () {
diff --git a/test/commands/mode.js b/test/commands/mode.ts
similarity index 86%
rename from test/commands/mode.js
rename to test/commands/mode.ts
index a6ea9bad..183be912 100644
--- a/test/commands/mode.js
+++ b/test/commands/mode.ts
@@ -1,9 +1,9 @@
-"use strict";
+// @ts-nocheck TODO re-enable
+import {expect} from "chai";
+import Client from "../../server/client";
 
-const expect = require("chai").expect;
-
-const Chan = require("../../src/models/chan");
-const ModeCommand = require("../../src/plugins/inputs/mode");
+import Chan, {ChanType} from "../../server/models/chan";
+import ModeCommand from "../../server/plugins/inputs/mode";
 
 describe("Commands", function () {
 	describe("/mode", function () {
@@ -13,7 +13,7 @@ describe("Commands", function () {
 
 		const lobby = new Chan({
 			name: "Network Lobby",
-			type: Chan.Type.LOBBY,
+			type: ChanType.LOBBY,
 		});
 
 		const testableNetwork = {
@@ -22,17 +22,27 @@ describe("Commands", function () {
 			nick: "xPaw",
 			irc: {
 				network: {
-					supports(type) {
+					supports(type: string) {
 						if (type.toUpperCase() === "MODES") {
 							return "4";
 						}
 					},
 				},
-				raw(...args) {
+				raw(...args: string[]) {
 					testableNetwork.firstCommand = testableNetwork.lastCommand;
 					testableNetwork.lastCommand = args.join(" ");
 				},
 			},
+		} as {
+			firstCommand: string | null;
+			lastCommand: string | null;
+			nick: string;
+			irc: {
+				network: {
+					supports(type: string): string;
+				};
+				raw(...args: string[]): void;
+			};
 		};
 
 		const testableNetworkNoSupports = Object.assign({}, testableNetwork, {
@@ -42,15 +52,15 @@ describe("Commands", function () {
 						return null;
 					},
 				},
-				raw(...args) {
+				raw(...args: string[]) {
 					testableNetworkNoSupports.firstCommand = testableNetworkNoSupports.lastCommand;
 					testableNetworkNoSupports.lastCommand = args.join(" ");
 				},
 			},
 		});
 
-		it("should not mess with the given target", function () {
-			const test = function (expected, args) {
+		it("should not mess with the given target", function (this: CommandContext) {
+			const test = function (expected: string, args: string[]) {
 				ModeCommand.input(testableNetwork, channel, "mode", Array.from(args));
 				expect(testableNetwork.lastCommand).to.equal(expected);
 
diff --git a/test/fixtures/.gitignore b/test/fixtures/.gitignore
index f6cb85dc..88823c3f 100644
--- a/test/fixtures/.gitignore
+++ b/test/fixtures/.gitignore
@@ -2,6 +2,7 @@
 .thelounge/storage/
 .thelounge/logs/
 .thelounge/certificates/
+.thelounge/sts-policies.json
 
 # Fixtures contain fake packages, stored in a fake node_modules folder
 !.thelounge/packages/node_modules/
diff --git a/test/fixtures/.thelounge/config.js b/test/fixtures/.thelounge/config.js
index 9767acc9..2c7dfd61 100644
--- a/test/fixtures/.thelounge/config.js
+++ b/test/fixtures/.thelounge/config.js
@@ -1,11 +1,12 @@
 "use strict";
 
-var config = require("../../../defaults/config.js");
+import config from "../../../defaults/config.js";
 
 config.defaults.name = "Example IRC Server";
 config.defaults.host = "irc.example.com";
 config.public = true;
 config.prefetch = true;
+// @ts-ignore
 config.host = config.bind = "127.0.0.1";
 config.port = 61337;
 config.transports = ["websocket"];
diff --git a/test/fixtures/env.js b/test/fixtures/env.js
deleted file mode 100644
index dcdb1a25..00000000
--- a/test/fixtures/env.js
+++ /dev/null
@@ -1,13 +0,0 @@
-"use strict";
-
-const fs = require("fs");
-
-const home = require("path").join(__dirname, ".thelounge");
-require("../../src/config").setHome(home);
-
-const STSPolicies = require("../../src/plugins/sts"); // Must be imported *after* setHome
-
-exports.mochaGlobalTeardown = async function () {
-	STSPolicies.refresh.cancel(); // Cancel debounced function, so it does not write later
-	fs.unlinkSync(STSPolicies.stsFile);
-};
diff --git a/test/fixtures/env.ts b/test/fixtures/env.ts
new file mode 100644
index 00000000..55100767
--- /dev/null
+++ b/test/fixtures/env.ts
@@ -0,0 +1,5 @@
+import * as path from "path";
+const home = path.join(__dirname, ".thelounge");
+
+import config from "../../server/config";
+config.setHome(home);
diff --git a/test/models/chan.js b/test/models/chan.ts
similarity index 92%
rename from test/models/chan.js
rename to test/models/chan.ts
index c62e87cb..1395d128 100644
--- a/test/models/chan.js
+++ b/test/models/chan.ts
@@ -1,10 +1,10 @@
-"use strict";
-
-const expect = require("chai").expect;
-const Chan = require("../../src/models/chan");
-const Msg = require("../../src/models/msg");
-const User = require("../../src/models/user");
+import {expect} from "chai";
 
+import Chan from "../../server/models/chan";
+import Msg from "../../server/models/msg";
+import Network from "../../server/models/network";
+import Prefix from "../../server/models/prefix";
+import User from "../../server/models/user";
 describe("Chan", function () {
 	const network = {
 		network: {
@@ -20,7 +20,7 @@ describe("Chan", function () {
 		},
 	};
 
-	const prefixLookup = {modeToSymbol: {}};
+	const prefixLookup = {modeToSymbol: {}} as Prefix;
 
 	network.network.options.PREFIX.forEach((mode) => {
 		prefixLookup.modeToSymbol[mode.mode] = mode.symbol;
@@ -39,7 +39,7 @@ describe("Chan", function () {
 		});
 
 		it("should find a message in the list of messages", function () {
-			expect(chan.findMessage(2).text).to.equal("Message to be found");
+			expect(chan.findMessage(2)?.text).to.equal("Message to be found");
 		});
 
 		it("should not find a message that does not exist", function () {
@@ -83,8 +83,8 @@ describe("Chan", function () {
 	});
 
 	describe("#getSortedUsers(irc)", function () {
-		const getUserNames = function (chan) {
-			return chan.getSortedUsers(network).map((u) => u.nick);
+		const getUserNames = function (chan: Chan) {
+			return chan.getSortedUsers(network as Network["irc"]).map((u) => u.nick);
 		};
 
 		it("returns unsorted list on null irc object", function () {
diff --git a/test/models/msg.js b/test/models/msg.ts
similarity index 76%
rename from test/models/msg.js
rename to test/models/msg.ts
index 7690754a..3f418de9 100644
--- a/test/models/msg.js
+++ b/test/models/msg.ts
@@ -1,9 +1,8 @@
-"use strict";
+import {expect} from "chai";
 
-const expect = require("chai").expect;
-
-const Msg = require("../../src/models/msg");
-const User = require("../../src/models/user");
+import Msg from "../../server/models/msg";
+import User from "../../server/models/user";
+import {LinkPreview} from "../../server/plugins/irc-events/link";
 
 describe("Msg", function () {
 	["from", "target"].forEach((prop) => {
@@ -14,12 +13,12 @@ describe("Msg", function () {
 					modes: ["o"],
 					nick: "foo",
 				},
-				prefixLookup
+				prefixLookup as any
 			);
 			const msg = new Msg({[prop]: user});
 
 			// Mutating the user
-			user.setModes(["a"], prefixLookup);
+			user.setModes(["a"], prefixLookup as any);
 			user.nick = "bar";
 
 			// Message's `.from`/etc. should still refer to the original user
@@ -46,11 +45,11 @@ describe("Msg", function () {
 					type: "link",
 					shown: true,
 				},
-			],
+			] as LinkPreview[],
 		});
 
 		it("should find a preview given an existing link", function () {
-			expect(msg.findPreview("https://thelounge.chat/").head).to.equal("The Lounge");
+			expect(msg.findPreview("https://thelounge.chat/")?.head).to.equal("The Lounge");
 		});
 
 		it("should not find a preview that does not exist", function () {
diff --git a/test/models/network.js b/test/models/network.ts
similarity index 82%
rename from test/models/network.js
rename to test/models/network.ts
index d933439c..9181a558 100644
--- a/test/models/network.js
+++ b/test/models/network.ts
@@ -1,15 +1,25 @@
-"use strict";
-
-const expect = require("chai").expect;
-const Chan = require("../../src/models/chan");
-const Msg = require("../../src/models/msg");
-const User = require("../../src/models/user");
-const Network = require("../../src/models/network");
-const Config = require("../../src/config");
-const STSPolicies = require("../../src/plugins/sts");
-const ClientCertificate = require("../../src/plugins/clientCertificate");
+/* eslint-disable @typescript-eslint/no-empty-function */
+import {expect} from "chai";
+import sinon from "ts-sinon";
+import Chan, {ChanType} from "../../server/models/chan";
+import Msg from "../../server/models/msg";
+import User from "../../server/models/user";
+import Network from "../../server/models/network";
+import Config from "../../server/config";
+import STSPolicies from "../../server/plugins/sts";
+import ClientCertificate from "../../server/plugins/clientCertificate";
 
 describe("Network", function () {
+	let stsPoliciesRefreshStub: sinon.SinonStub<unknown[], void>;
+
+	before(function () {
+		stsPoliciesRefreshStub = sinon.stub(STSPolicies, "refresh");
+	});
+
+	after(function () {
+		stsPoliciesRefreshStub.restore();
+	});
+
 	describe("Network(attr)", function () {
 		it("should generate uuid (v4) for each network", function () {
 			const network1 = new Network();
@@ -24,7 +34,7 @@ describe("Network", function () {
 			const network = new Network({
 				name: "Super Nice Network",
 				channels: [
-					new Chan({name: "AAAA!", type: Chan.Type.QUERY}),
+					new Chan({name: "AAAA!", type: ChanType.QUERY}),
 					new Chan({name: "#thelounge"}),
 					new Chan({name: "&foobar"}),
 				],
@@ -32,7 +42,7 @@ describe("Network", function () {
 			network.channels.push(new Chan({name: "#swag"}));
 
 			expect(network.channels[0].name).to.equal("Super Nice Network");
-			expect(network.channels[0].type).to.equal(Chan.Type.LOBBY);
+			expect(network.channels[0].type).to.equal(ChanType.LOBBY);
 		});
 
 		it("should maintain channel reference", function () {
@@ -83,8 +93,8 @@ describe("Network", function () {
 					new Chan({name: "&foobar", key: "", muted: false}),
 					new Chan({name: "#secret", key: "foo", muted: false}),
 					new Chan({name: "&secure", key: "bar", muted: true}),
-					new Chan({name: "Channel List", type: Chan.Type.SPECIAL}),
-					new Chan({name: "PrivateChat", type: Chan.Type.QUERY, muted: true}),
+					new Chan({name: "Channel List", type: ChanType.SPECIAL}),
+					new Chan({name: "PrivateChat", type: ChanType.QUERY, muted: true}),
 				],
 			});
 			network.setNick("chillin`");
@@ -132,7 +142,7 @@ describe("Network", function () {
 				host: "localhost",
 			});
 
-			expect(network.validate()).to.be.true;
+			expect(network.validate({} as any)).to.be.true;
 			expect(network.nick).to.equal("thelounge");
 			expect(network.username).to.equal("thelounge");
 			expect(network.realname).to.equal("The Lounge User");
@@ -142,7 +152,7 @@ describe("Network", function () {
 				host: "localhost",
 				nick: "@Invalid Nick?",
 			});
-			expect(network2.validate()).to.be.true;
+			expect(network2.validate({} as any)).to.be.true;
 			expect(network2.username).to.equal("InvalidNick");
 		});
 
@@ -158,7 +168,7 @@ describe("Network", function () {
 				tls: false,
 				rejectUnauthorized: false,
 			});
-			expect(network.validate()).to.be.true;
+			expect(network.validate({} as any)).to.be.true;
 			expect(network.host).to.equal("irc.example.com");
 			expect(network.port).to.equal(6697);
 			expect(network.tls).to.be.true;
@@ -170,15 +180,16 @@ describe("Network", function () {
 			const network2 = new Network({
 				host: "some.fake.tld",
 			});
-			expect(network2.validate()).to.be.true;
+			expect(network2.validate({} as any)).to.be.true;
 			expect(network2.host).to.equal("irc.example.com");
 
 			Config.values.lockNetwork = false;
 		});
 
 		it("should apply STS policies iff they match", function () {
-			const client = {idMsg: 1, emit() {}};
+			const client = {idMsg: 1, emit() {}} as any;
 			STSPolicies.update("irc.example.com", 7000, 3600);
+			expect(STSPolicies.get("irc.example.com")).to.not.be.null;
 
 			let network = new Network({
 				host: "irc.example.com",
@@ -201,6 +212,7 @@ describe("Network", function () {
 			expect(network.tls).to.be.false;
 
 			STSPolicies.update("irc.example.com", 7000, 0); // Cleanup
+			expect(STSPolicies.get("irc.example.com")).to.be.null;
 		});
 
 		it("should not remove client certs if TLS is disabled", function () {
@@ -209,14 +221,14 @@ describe("Network", function () {
 			const client = {idMsg: 1, emit() {}, messageStorage: []};
 
 			const network = new Network({host: "irc.example.com", sasl: "external"});
-			network.createIrcFramework(client);
+			(network as any).createIrcFramework(client);
 			expect(network.irc).to.not.be.null;
 
-			const client_cert = network.irc.options.client_certificate;
+			const client_cert = network.irc?.options?.client_certificate;
 			expect(client_cert).to.not.be.null;
 			expect(ClientCertificate.get(network.uuid)).to.deep.equal(client_cert);
 
-			expect(network.validate(client)).to.be.true;
+			expect(network.validate(client as any)).to.be.true;
 
 			expect(ClientCertificate.get(network.uuid)).to.deep.equal(client_cert); // Should be unchanged
 
@@ -229,21 +241,25 @@ describe("Network", function () {
 
 			const client = {idMsg: 1, emit() {}, messageStorage: []};
 			STSPolicies.update("irc.example.com", 7000, 3600);
+			expect(STSPolicies.get("irc.example.com")).to.not.be.null;
 
 			const network = new Network({host: "irc.example.com", sasl: "external"});
-			network.createIrcFramework(client);
+			(network as any).createIrcFramework(client);
 			expect(network.irc).to.not.be.null;
 
-			const client_cert = network.irc.options.client_certificate;
+			const client_cert = network.irc?.options?.client_certificate;
 			expect(client_cert).to.not.be.null;
 			expect(ClientCertificate.get(network.uuid)).to.deep.equal(client_cert);
 
-			expect(network.validate(client)).to.be.true;
+			expect(network.validate(client as any)).to.be.true;
 
 			expect(ClientCertificate.get(network.uuid)).to.deep.equal(client_cert); // Should be unchanged
 
 			ClientCertificate.remove(network.uuid);
 			Config.values.public = true;
+
+			STSPolicies.update("irc.example.com", 7000, 0); // Cleanup
+			expect(STSPolicies.get("irc.example.com")).to.be.null;
 		});
 	});
 
@@ -253,8 +269,9 @@ describe("Network", function () {
 
 			const client = {idMsg: 1, emit() {}};
 			STSPolicies.update("irc.example.com", 7000, 3600);
+			expect(STSPolicies.get("irc.example.com")).to.not.be.null;
 
-			let network = new Network({host: "irc.example.com"});
+			let network: any = new Network({host: "irc.example.com"});
 			network.createIrcFramework(client);
 			expect(network.irc).to.not.be.null;
 			expect(network.irc.options.client_certificate).to.be.null;
@@ -266,6 +283,9 @@ describe("Network", function () {
 
 			ClientCertificate.remove(network.uuid);
 			Config.values.public = true;
+
+			STSPolicies.update("irc.example.com", 7000, 0); // Cleanup
+			expect(STSPolicies.get("irc.example.com")).to.be.null;
 		});
 	});
 
@@ -275,7 +295,7 @@ describe("Network", function () {
 			let nameEmitCalled = false;
 
 			const network = new Network();
-			network.edit(
+			(network as any).edit(
 				{
 					emit(name, data) {
 						if (name === "network:name") {
@@ -311,7 +331,10 @@ describe("Network", function () {
 			expect(saveCalled).to.be.true;
 			expect(nameEmitCalled).to.be.true;
 			expect(network.uuid).to.not.equal("newuuid");
+
+			// @ts-expect-error Property 'ip' does not exist on type 'Network'.
 			expect(network.ip).to.be.undefined;
+			// @ts-expect-error Property 'hostname' does not exist on type 'Network'.
 			expect(network.hostname).to.be.undefined;
 
 			expect(network.name).to.equal("Lounge Test Network");
@@ -420,7 +443,7 @@ describe("Network", function () {
 				channels: [chan1, chan2],
 			});
 
-			const newUser = new Chan({name: "mcinkay", type: Chan.Type.QUERY});
+			const newUser = new Chan({name: "mcinkay", type: ChanType.QUERY});
 			network.addChannel(newUser);
 
 			expect(network.channels[1]).to.equal(chan1);
@@ -431,14 +454,14 @@ describe("Network", function () {
 		it("should sort users alphabetically", function () {
 			const chan1 = new Chan({name: "#abc"});
 			const chan2 = new Chan({name: "#THELOUNGE"});
-			const user1 = new Chan({name: "astorije", type: Chan.Type.QUERY});
-			const user2 = new Chan({name: "xpaw", type: Chan.Type.QUERY});
+			const user1 = new Chan({name: "astorije", type: ChanType.QUERY});
+			const user2 = new Chan({name: "xpaw", type: ChanType.QUERY});
 
 			const network = new Network({
 				channels: [chan1, chan2, user1, user2],
 			});
 
-			const newUser = new Chan({name: "mcinkay", type: Chan.Type.QUERY});
+			const newUser = new Chan({name: "mcinkay", type: ChanType.QUERY});
 			network.addChannel(newUser);
 
 			expect(network.channels[1]).to.equal(chan1);
@@ -451,14 +474,14 @@ describe("Network", function () {
 		it("should not sort special channels", function () {
 			const chan1 = new Chan({name: "#abc"});
 			const chan2 = new Chan({name: "#THELOUNGE"});
-			const user1 = new Chan({name: "astorije", type: Chan.Type.QUERY});
-			const user2 = new Chan({name: "xpaw", type: Chan.Type.QUERY});
+			const user1 = new Chan({name: "astorije", type: ChanType.QUERY});
+			const user2 = new Chan({name: "xpaw", type: ChanType.QUERY});
 
 			const network = new Network({
 				channels: [chan1, chan2, user1, user2],
 			});
 
-			const newBanlist = new Chan({name: "Banlist for #THELOUNGE", type: Chan.Type.SPECIAL});
+			const newBanlist = new Chan({name: "Banlist for #THELOUNGE", type: ChanType.SPECIAL});
 			network.addChannel(newBanlist);
 
 			expect(network.channels[1]).to.equal(chan1);
@@ -471,15 +494,15 @@ describe("Network", function () {
 		it("should not compare against special channels", function () {
 			const chan1 = new Chan({name: "#abc"});
 			const chan2 = new Chan({name: "#THELOUNGE"});
-			const user1 = new Chan({name: "astorije", type: Chan.Type.QUERY});
+			const user1 = new Chan({name: "astorije", type: ChanType.QUERY});
 
 			const network = new Network({
 				channels: [chan1, chan2, user1],
 			});
 
-			const newBanlist = new Chan({name: "Banlist for #THELOUNGE", type: Chan.Type.SPECIAL});
+			const newBanlist = new Chan({name: "Banlist for #THELOUNGE", type: ChanType.SPECIAL});
 			network.addChannel(newBanlist);
-			const newUser = new Chan({name: "mcinkay", type: Chan.Type.QUERY});
+			const newUser = new Chan({name: "mcinkay", type: ChanType.QUERY});
 			network.addChannel(newUser);
 
 			expect(network.channels[1]).to.equal(chan1);
@@ -490,9 +513,9 @@ describe("Network", function () {
 		});
 
 		it("should insert before first special channel", function () {
-			const banlist = new Chan({name: "Banlist for #THELOUNGE", type: Chan.Type.SPECIAL});
+			const banlist = new Chan({name: "Banlist for #THELOUNGE", type: ChanType.SPECIAL});
 			const chan1 = new Chan({name: "#thelounge"});
-			const user1 = new Chan({name: "astorije", type: Chan.Type.QUERY});
+			const user1 = new Chan({name: "astorije", type: ChanType.QUERY});
 
 			const network = new Network({
 				channels: [banlist, chan1, user1],
diff --git a/test/plugins/auth/ldap.js b/test/plugins/auth/ldap.ts
similarity index 72%
rename from test/plugins/auth/ldap.js
rename to test/plugins/auth/ldap.ts
index da101e66..8f26ba81 100644
--- a/test/plugins/auth/ldap.js
+++ b/test/plugins/auth/ldap.ts
@@ -1,12 +1,11 @@
-"use strict";
-
-const log = require("../../../src/log");
-const ldapAuth = require("../../../src/plugins/auth/ldap");
-const Config = require("../../../src/config");
-const ldap = require("ldapjs");
-const expect = require("chai").expect;
-const stub = require("sinon").stub;
-const TestUtil = require("../../util");
+import log from "../../../server/log";
+import ldapAuth from "../../../server/plugins/auth/ldap";
+import Config from "../../../server/config";
+import ldap from "ldapjs";
+import {expect} from "chai";
+import TestUtil from "../../util";
+import ClientManager from "../../../server/clientManager";
+import sinon from "ts-sinon";
 
 const user = "johndoe";
 const wrongUser = "eve";
@@ -16,8 +15,8 @@ const baseDN = "ou=accounts,dc=example,dc=com";
 const primaryKey = "uid";
 const serverPort = 1389;
 
-function normalizeDN(dn) {
-	return ldap.parseDN(dn).toString();
+function normalizeDN(dn: string) {
+	return String(ldap.parseDN(dn).toString());
 }
 
 function startLdapServer(callback) {
@@ -33,7 +32,7 @@ function startLdapServer(callback) {
 	authorizedUsers[normalizeDN(searchConf.rootDN)] = searchConf.rootPassword;
 	authorizedUsers[normalizeDN(userDN)] = correctPassword;
 
-	function authorize(req, res, next) {
+	function authorize(req: any, res: any, next: (error?: any) => void) {
 		const bindDN = req.connection.ldap.bindDN;
 
 		if (bindDN in authorizedUsers) {
@@ -44,7 +43,7 @@ function startLdapServer(callback) {
 	}
 
 	Object.keys(authorizedUsers).forEach(function (dn) {
-		server.bind(dn, function (req, res, next) {
+		server.bind(dn, function (req, res, next: (error?: any) => void) {
 			const bindDN = req.dn.toString();
 			const password = req.credentials;
 
@@ -86,11 +85,12 @@ function startLdapServer(callback) {
 function testLdapAuth() {
 	// Create mock manager and client. When client is true, manager should not
 	// be used. But ideally the auth plugin should not use any of those.
-	const manager = {};
+	const manager = {} as ClientManager;
 	const client = true;
 
 	it("should successfully authenticate with correct password", function (done) {
-		ldapAuth.auth(manager, client, user, correctPassword, function (valid) {
+		// TODO: why is client = true?
+		ldapAuth.auth(manager, client as any, user, correctPassword, function (valid) {
 			expect(valid).to.equal(true);
 			done();
 		});
@@ -98,26 +98,31 @@ function testLdapAuth() {
 
 	it("should fail to authenticate with incorrect password", function (done) {
 		let error = "";
-		stub(log, "error").callsFake(TestUtil.sanitizeLog((str) => (error += str)));
 
-		ldapAuth.auth(manager, client, user, wrongPassword, function (valid) {
+		const errorLogStub = sinon
+			.stub(log, "error")
+			.callsFake(TestUtil.sanitizeLog((str) => (error += str)));
+
+		ldapAuth.auth(manager, client as any, user, wrongPassword, function (valid) {
 			expect(valid).to.equal(false);
 			expect(error).to.equal(
 				"LDAP bind failed: InsufficientAccessRightsError: InsufficientAccessRightsError\n"
 			);
-			log.error.restore();
+			errorLogStub.restore();
 			done();
 		});
 	});
 
 	it("should fail to authenticate with incorrect username", function (done) {
 		let warning = "";
-		stub(log, "warn").callsFake(TestUtil.sanitizeLog((str) => (warning += str)));
+		const warnLogStub = sinon
+			.stub(log, "warn")
+			.callsFake(TestUtil.sanitizeLog((str) => (warning += str)));
 
-		ldapAuth.auth(manager, client, wrongUser, correctPassword, function (valid) {
+		ldapAuth.auth(manager, client as any, wrongUser, correctPassword, function (valid) {
 			expect(valid).to.equal(false);
 			expect(warning).to.equal("LDAP Search did not find anything for: eve (0)\n");
-			log.warn.restore();
+			warnLogStub.restore();
 			done();
 		});
 	});
@@ -128,24 +133,25 @@ describe("LDAP authentication plugin", function () {
 	this.timeout(TestUtil.isRunningOnCI() ? 25000 : 5000);
 	this.slow(300);
 
-	let server;
+	let server: ldap.Server;
+	let logInfoStub: sinon.SinonStub<string[], void>;
 
 	before(function (done) {
-		stub(log, "info");
-
+		logInfoStub = sinon.stub(log, "info");
 		server = startLdapServer(done);
 	});
 
 	after(function () {
-		server.close();
-
-		log.info.restore();
+		server.close(() => {
+			// no-op
+		});
+		logInfoStub.restore();
 	});
 
 	beforeEach(function () {
 		Config.values.public = false;
 		Config.values.ldap.enable = true;
-		Config.values.ldap.url = "ldap://localhost:" + String(serverPort);
+		Config.values.ldap.url = "ldap://127.0.0.1:" + String(serverPort);
 		Config.values.ldap.primaryKey = primaryKey;
 	});
 
diff --git a/test/plugins/clientCertificate.js b/test/plugins/clientCertificate.ts
similarity index 84%
rename from test/plugins/clientCertificate.js
rename to test/plugins/clientCertificate.ts
index fad096a2..2ac359ae 100644
--- a/test/plugins/clientCertificate.js
+++ b/test/plugins/clientCertificate.ts
@@ -1,10 +1,8 @@
-"use strict";
-
-const fs = require("fs");
-const path = require("path");
-const {expect} = require("chai");
-const ClientCertificate = require("../../src/plugins/clientCertificate");
-const Config = require("../../src/config");
+import fs from "fs";
+import path from "path";
+import {expect} from "chai";
+import ClientCertificate, {ClientCertificateType} from "../../server/plugins/clientCertificate";
+import Config from "../../server/config";
 
 describe("ClientCertificate", function () {
 	it("should not generate a client certificate in public mode", function () {
@@ -16,12 +14,12 @@ describe("ClientCertificate", function () {
 
 	it("should generate a client certificate", function () {
 		Config.values.public = false;
-		const certificate = ClientCertificate.get("this-is-test-uuid");
+		const certificate = ClientCertificate.get("this-is-test-uuid") as ClientCertificateType;
 
 		expect(certificate.certificate).to.match(/^-----BEGIN CERTIFICATE-----/);
 		expect(certificate.private_key).to.match(/^-----BEGIN RSA PRIVATE KEY-----/);
 
-		const certificate2 = ClientCertificate.get("this-is-test-uuid");
+		const certificate2 = ClientCertificate.get("this-is-test-uuid") as ClientCertificateType;
 		expect(certificate2.certificate).to.equal(certificate.certificate);
 		expect(certificate2.private_key).to.equal(certificate.private_key);
 
diff --git a/test/plugins/inputs/indexTest.js b/test/plugins/inputs/indexTest.ts
similarity index 81%
rename from test/plugins/inputs/indexTest.js
rename to test/plugins/inputs/indexTest.ts
index 75cef0ba..2cae7c7d 100644
--- a/test/plugins/inputs/indexTest.js
+++ b/test/plugins/inputs/indexTest.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const inputs = require("../../../src/plugins/inputs");
+import {expect} from "chai";
+import inputs from "../../../server/plugins/inputs";
 
 describe("inputs", function () {
 	describe(".getCommands", function () {
diff --git a/test/plugins/link.js b/test/plugins/link.ts
similarity index 97%
rename from test/plugins/link.js
rename to test/plugins/link.ts
index a121cdde..6c91ab6b 100644
--- a/test/plugins/link.js
+++ b/test/plugins/link.ts
@@ -1,10 +1,10 @@
-"use strict";
-
-const path = require("path");
-const expect = require("chai").expect;
-const util = require("../util");
-const Config = require("../../src/config");
-const link = require("../../src/plugins/irc-events/link.js");
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+/* eslint-disable @typescript-eslint/restrict-plus-operands */
+import path from "path";
+import {expect} from "chai";
+import util from "../util";
+import Config from "../../server/config";
+import link, {LinkPreview} from "../../server/plugins/irc-events/link";
 
 describe("Link plugin", function () {
 	// Increase timeout due to unpredictable I/O on CI services
@@ -479,7 +479,7 @@ Vivamus bibendum vulputate tincidunt. Sed vitae ligula felis.`;
 			res.send("<title>second title</title>");
 		});
 
-		const previews = [];
+		const previews: LinkPreview[] = [];
 
 		this.irc.on("msg:preview", function (data) {
 			if (data.preview.link === "http://localhost:" + port + "/one") {
@@ -601,7 +601,7 @@ Vivamus bibendum vulputate tincidunt. Sed vitae ligula felis.`;
 			res.send(`<title>${req.query.q}</title>`);
 		});
 
-		const previews = [];
+		const previews: LinkPreview[] = [];
 
 		this.irc.on("msg:preview", function (data) {
 			previews.push(data.preview.link);
@@ -617,7 +617,9 @@ Vivamus bibendum vulputate tincidunt. Sed vitae ligula felis.`;
 			}
 
 			if (previews.length === 5) {
-				expect(message.previews.map((preview) => preview.link)).to.have.members(previews);
+				expect(
+					message.previews.map((preview) => preview.link as LinkPreview)
+				).to.have.members(previews);
 				done();
 			}
 		});
@@ -729,7 +731,7 @@ Vivamus bibendum vulputate tincidunt. Sed vitae ligula felis.`;
 			text: "http://localhost:" + this.port + "/basic-og-once-lang",
 		});
 
-		const requests = [];
+		const requests: string[] = [];
 		let responses = 0;
 
 		this.irc.config.browser.language = "first language";
diff --git a/test/plugins/packages/indexTest.js b/test/plugins/packages/indexTest.ts
similarity index 66%
rename from test/plugins/packages/indexTest.js
rename to test/plugins/packages/indexTest.ts
index 3f1d7383..ca4c0d13 100644
--- a/test/plugins/packages/indexTest.js
+++ b/test/plugins/packages/indexTest.ts
@@ -1,22 +1,24 @@
-"use strict";
+import log from "../../../server/log";
+import {expect} from "chai";
+import TestUtil from "../../util";
+import sinon from "ts-sinon";
+import packagePlugin from "../../../server/plugins/packages";
 
-const log = require("../../../src/log");
-const expect = require("chai").expect;
-const stub = require("sinon").stub;
-const TestUtil = require("../../util");
-
-let packages;
+let packages: typeof packagePlugin;
 
 describe("packages", function () {
-	beforeEach(function () {
-		stub(log, "info");
+	let logInfoStub: sinon.SinonStub<string[], void>;
 
-		delete require.cache[require.resolve("../../../src/plugins/packages")];
-		packages = require("../../../src/plugins/packages");
+	beforeEach(function () {
+		logInfoStub = sinon.stub(log, "info");
+
+		delete require.cache[require.resolve("../../../server/plugins/packages")];
+		// eslint-disable-next-line @typescript-eslint/no-var-requires
+		packages = require("../../../server/plugins/packages").default;
 	});
 
 	afterEach(function () {
-		log.info.restore();
+		logInfoStub.restore();
 	});
 
 	describe(".getStylesheets", function () {
@@ -46,10 +48,11 @@ describe("packages", function () {
 	describe(".loadPackages", function () {
 		it("should display report about loading packages", function () {
 			// Mock `log.info` to extract its effect into a string
-			log.info.restore();
+			logInfoStub.restore();
 			let stdout = "";
-			stub(log, "info").callsFake(TestUtil.sanitizeLog((str) => (stdout += str)));
-
+			logInfoStub = sinon
+				.stub(log, "info")
+				.callsFake(TestUtil.sanitizeLog((str) => (stdout += str)));
 			packages.loadPackages();
 
 			expect(stdout).to.deep.equal(
diff --git a/test/plugins/sqlite.js b/test/plugins/sqlite.ts
similarity index 77%
rename from test/plugins/sqlite.js
rename to test/plugins/sqlite.ts
index 35016522..00211339 100644
--- a/test/plugins/sqlite.js
+++ b/test/plugins/sqlite.ts
@@ -1,12 +1,12 @@
-"use strict";
-
-const fs = require("fs");
-const path = require("path");
-const expect = require("chai").expect;
-const util = require("../util");
-const Msg = require("../../src/models/msg");
-const Config = require("../../src/config");
-const MessageStorage = require("../../src/plugins/messageStorage/sqlite.js");
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+import fs from "fs";
+import path from "path";
+import {expect} from "chai";
+import util from "../util";
+import Msg, {MessageType} from "../../server/models/msg";
+import Config from "../../server/config";
+import MessageStorage from "../../server/plugins/messageStorage/sqlite";
+import Client from "../../server/client";
 
 describe("SQLite Message Storage", function () {
 	// Increase timeout due to unpredictable I/O on CI services
@@ -14,13 +14,13 @@ describe("SQLite Message Storage", function () {
 	this.slow(300);
 
 	const expectedPath = path.join(Config.getHomePath(), "logs", "testUser.sqlite3");
-	let store;
+	let store: MessageStorage;
 
 	before(function (done) {
 		store = new MessageStorage({
 			name: "testUser",
 			idMsg: 1,
-		});
+		} as Client);
 
 		// Delete database file from previous test run
 		if (fs.existsSync(expectedPath)) {
@@ -38,7 +38,7 @@ describe("SQLite Message Storage", function () {
 	});
 
 	it("should resolve an empty array when disabled", function () {
-		return store.getMessages(null, null).then((messages) => {
+		return store.getMessages(null as any, null as any).then((messages) => {
 			expect(messages).to.be.empty;
 		});
 	});
@@ -94,14 +94,14 @@ describe("SQLite Message Storage", function () {
 		store.index(
 			{
 				uuid: "this-is-a-network-guid",
-			},
+			} as any,
 			{
 				name: "#thisISaCHANNEL",
-			},
+			} as any,
 			new Msg({
 				time: 123456789,
 				text: "Hello from sqlite world!",
-			})
+			} as any)
 		);
 	});
 
@@ -110,10 +110,10 @@ describe("SQLite Message Storage", function () {
 			.getMessages(
 				{
 					uuid: "this-is-a-network-guid",
-				},
+				} as any,
 				{
 					name: "#thisisaCHANNEL",
-				}
+				} as any
 			)
 			.then((messages) => {
 				expect(messages).to.have.lengthOf(1);
@@ -121,7 +121,7 @@ describe("SQLite Message Storage", function () {
 				const msg = messages[0];
 
 				expect(msg.text).to.equal("Hello from sqlite world!");
-				expect(msg.type).to.equal(Msg.Type.MESSAGE);
+				expect(msg.type).to.equal(MessageType.MESSAGE);
 				expect(msg.time.getTime()).to.equal(123456789);
 			});
 	});
@@ -134,17 +134,20 @@ describe("SQLite Message Storage", function () {
 
 			for (let i = 0; i < 200; ++i) {
 				store.index(
-					{uuid: "retrieval-order-test-network"},
-					{name: "#channel"},
+					{uuid: "retrieval-order-test-network"} as any,
+					{name: "#channel"} as any,
 					new Msg({
 						time: 123456789 + i,
 						text: `msg ${i}`,
-					})
+					} as any)
 				);
 			}
 
 			return store
-				.getMessages({uuid: "retrieval-order-test-network"}, {name: "#channel"})
+				.getMessages(
+					{uuid: "retrieval-order-test-network"} as any,
+					{name: "#channel"} as any
+				)
 				.then((messages) => {
 					expect(messages).to.have.lengthOf(2);
 					expect(messages.map((i) => i.text)).to.deep.equal(["msg 198", "msg 199"]);
@@ -164,16 +167,18 @@ describe("SQLite Message Storage", function () {
 				.search({
 					searchTerm: "msg",
 					networkUuid: "retrieval-order-test-network",
-				})
+				} as any)
 				.then((messages) => {
+					// @ts-expect-error Property 'results' does not exist on type '[]'.
 					expect(messages.results).to.have.lengthOf(100);
 
-					const expectedMessages = [];
+					const expectedMessages: string[] = [];
 
 					for (let i = 100; i < 200; ++i) {
 						expectedMessages.push(`msg ${i}`);
 					}
 
+					// @ts-expect-error Property 'results' does not exist on type '[]'.
 					expect(messages.results.map((i) => i.text)).to.deep.equal(expectedMessages);
 				});
 		} finally {
@@ -187,8 +192,9 @@ describe("SQLite Message Storage", function () {
 				.search({
 					searchTerm: query,
 					networkUuid: "this-is-a-network-guid2",
-				})
+				} as any)
 				.then((messages) => {
+					// @ts-expect-error Property 'results' does not exist on type '[]'.
 					expect(messages.results.map((i) => i.text)).to.deep.equal(expected);
 				});
 		}
@@ -199,35 +205,38 @@ describe("SQLite Message Storage", function () {
 			Config.values.maxHistory = 3;
 
 			store.index(
-				{uuid: "this-is-a-network-guid2"},
-				{name: "#channel"},
+				{uuid: "this-is-a-network-guid2"} as any,
+				{name: "#channel"} as any,
 				new Msg({
 					time: 123456790,
 					text: `foo % bar _ baz`,
-				})
+				} as any)
 			);
 
 			store.index(
-				{uuid: "this-is-a-network-guid2"},
-				{name: "#channel"},
+				{uuid: "this-is-a-network-guid2"} as any,
+				{name: "#channel"} as any,
 				new Msg({
 					time: 123456791,
 					text: `foo bar x baz`,
-				})
+				} as any)
 			);
 
 			store.index(
-				{uuid: "this-is-a-network-guid2"},
-				{name: "#channel"},
+				{uuid: "this-is-a-network-guid2"} as any,
+				{name: "#channel"} as any,
 				new Msg({
 					time: 123456792,
 					text: `bar @ baz`,
-				})
+				} as any)
 			);
 
 			return (
 				store
-					.getMessages({uuid: "this-is-a-network-guid2"}, {name: "#channel"})
+					.getMessages(
+						{uuid: "this-is-a-network-guid2"} as any,
+						{name: "#channel"} as any
+					)
 					// .getMessages() waits for store.index() transactions to commit
 					.then(() => assertResults("foo", ["foo % bar _ baz", "foo bar x baz"]))
 					.then(() => assertResults("%", ["foo % bar _ baz"]))
diff --git a/test/plugins/storage.js b/test/plugins/storage.ts
similarity index 89%
rename from test/plugins/storage.js
rename to test/plugins/storage.ts
index 802937f9..4b011dda 100644
--- a/test/plugins/storage.js
+++ b/test/plugins/storage.ts
@@ -1,13 +1,13 @@
-"use strict";
-
-const fs = require("fs");
-const path = require("path");
-const crypto = require("crypto");
-const expect = require("chai").expect;
-const util = require("../util");
-const Config = require("../../src/config");
-const storage = require("../../src/plugins/storage");
-const link = require("../../src/plugins/irc-events/link.js");
+/* eslint-disable @typescript-eslint/restrict-plus-operands */
+import fs from "fs";
+import path from "path";
+import crypto from "crypto";
+import {expect} from "chai";
+import util from "../util";
+import Config from "../../server/config";
+import storage from "../../server/plugins/storage";
+import link from "../../server/plugins/irc-events/link";
+import {Request, Response} from "express";
 
 describe("Image storage", function () {
 	// Increase timeout due to unpredictable I/O on CI services
@@ -116,7 +116,7 @@ describe("Image storage", function () {
 			text: "http://localhost:" + port + "/svg-preview",
 		});
 
-		this.app.get("/svg-preview", function (req, res) {
+		this.app.get("/svg-preview", function (req: Request, res: Response) {
 			res.send(
 				"<title>test title</title><meta property='og:image' content='http://localhost:" +
 					port +
diff --git a/test/server.js b/test/server.ts
similarity index 71%
rename from test/server.js
rename to test/server.ts
index 28b2304f..571a6bcc 100644
--- a/test/server.js
+++ b/test/server.ts
@@ -1,33 +1,51 @@
-"use strict";
+import log from "../server/log";
+import Config from "../server/config";
+import {expect} from "chai";
+import got from "got";
+import io from "socket.io-client";
+import util from "./util";
+import changelog from "../server/plugins/changelog";
 
-const log = require("../src/log");
-const Config = require("../src/config");
-const expect = require("chai").expect;
-const stub = require("sinon").stub;
-const got = require("got");
-const io = require("socket.io-client");
-const util = require("./util");
-const changelog = require("../src/plugins/changelog");
+import sinon from "ts-sinon";
+import ClientManager from "../server/clientManager";
 
 describe("Server", function () {
 	// Increase timeout due to unpredictable I/O on CI services
 	this.timeout(util.isRunningOnCI() ? 25000 : 5000);
 
 	let server;
+	let logInfoStub: sinon.SinonStub<string[], void>;
+	let logWarnStub: sinon.SinonStub<string[], void>;
+	let checkForUpdatesStub: sinon.SinonStub<[manager: ClientManager], void>;
 
-	before(function () {
-		stub(log, "info");
-		stub(changelog, "checkForUpdates");
+	before(async function () {
+		logInfoStub = sinon.stub(log, "info");
+		logWarnStub = sinon.stub(log, "warn").callsFake((...args: string[]) => {
+			// vapid.json permissions do not survive in git
+			if (args.length > 1 && args[1] === "is world readable.") {
+				return;
+			}
 
-		server = require("../src/server")();
+			if (args.length > 0 && args[0].startsWith("run `chmod")) {
+				return;
+			}
+
+			// eslint-disable-next-line no-console
+			console.error(`Unhandled log.warn in server tests: ${args.join(" ")}`);
+		});
+
+		checkForUpdatesStub = sinon.stub(changelog, "checkForUpdates");
+		server = await (await import("../server/server")).default({} as any);
 	});
 
 	after(function (done) {
 		server.close(done);
-		log.info.restore();
-		changelog.checkForUpdates.restore();
+		logInfoStub.restore();
+		logWarnStub.restore();
+		checkForUpdatesStub.restore();
 	});
 
+	// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 	const webURL = `http://${Config.values.host}:${Config.values.port}/`;
 
 	describe("Express", () => {
@@ -51,7 +69,7 @@ describe("Server", function () {
 	describe("WebSockets", function () {
 		this.slow(300);
 
-		let client;
+		let client: ReturnType<typeof io>;
 
 		beforeEach(() => {
 			client = io(webURL, {
diff --git a/test/src/command-line/utilsTest.js b/test/src/command-line/utilsTest.ts
similarity index 84%
rename from test/src/command-line/utilsTest.js
rename to test/src/command-line/utilsTest.ts
index 34d9b930..d4348368 100644
--- a/test/src/command-line/utilsTest.js
+++ b/test/src/command-line/utilsTest.ts
@@ -1,24 +1,22 @@
-"use strict";
-
-const log = require("../../../src/log");
-const expect = require("chai").expect;
-const stub = require("sinon").stub;
-const TestUtil = require("../../util");
-const Utils = require("../../../src/command-line/utils");
+import log from "../../../server/log";
+import {expect} from "chai";
+import TestUtil from "../../util";
+import Utils from "../../../server/command-line/utils";
+import sinon from "ts-sinon";
 
 describe("Utils", function () {
 	describe(".extraHelp", function () {
-		afterEach(function () {
-			log.raw.restore();
-		});
-
 		it("should start and end with empty lines to display correctly with --help", function () {
 			// Mock `log.raw` to extract its effect into an array
-			const stdout = [];
-			stub(log, "raw").callsFake(TestUtil.sanitizeLog((str) => stdout.push(str)));
+			const stdout: string[] = [];
+			const logRawStub = sinon
+				.stub(log, "raw")
+				.callsFake(TestUtil.sanitizeLog((str) => stdout.push(str)));
 
 			Utils.extraHelp();
 
+			logRawStub.restore();
+
 			// Starts with 1 empty line
 			expect(stdout[0]).to.equal("\n");
 			expect(stdout[1]).to.not.equal("\n");
@@ -31,10 +29,15 @@ describe("Utils", function () {
 		it("should contain information about THELOUNGE_HOME env var", function () {
 			// Mock `log.raw` to extract its effect into a concatenated string
 			let stdout = "";
-			stub(log, "raw").callsFake(TestUtil.sanitizeLog((str) => (stdout += str)));
+
+			const logRawStub = sinon
+				.stub(log, "raw")
+				.callsFake(TestUtil.sanitizeLog((str) => (stdout += str)));
 
 			Utils.extraHelp();
 
+			logRawStub.restore();
+
 			expect(stdout).to.include("THELOUNGE_HOME");
 		});
 	});
@@ -128,24 +131,28 @@ describe("Utils", function () {
 			});
 
 			describe("when given the same key multiple times", function () {
-				afterEach(function () {
-					log.warn.restore();
-				});
-
 				it("should not override options", function () {
-					stub(log, "warn");
+					const logWarnStub = sinon.stub(log, "warn");
 
-					expect(Utils.parseConfigOptions("foo=baz", {foo: "bar"})).to.deep.equal({
+					const parsed = Utils.parseConfigOptions("foo=baz", {foo: "bar"});
+
+					logWarnStub.restore();
+
+					expect(parsed).to.deep.equal({
 						foo: "bar",
 					});
 				});
 
 				it("should display a warning", function () {
 					let warning = "";
-					stub(log, "warn").callsFake(TestUtil.sanitizeLog((str) => (warning += str)));
+					const logWarnStub = sinon
+						.stub(log, "warn")
+						.callsFake(TestUtil.sanitizeLog((str) => (warning += str)));
 
 					Utils.parseConfigOptions("foo=bar", {foo: "baz"});
 
+					logWarnStub.restore();
+
 					expect(warning).to.include("foo was already specified");
 				});
 			});
diff --git a/test/src/helperTest.js b/test/src/helperTest.ts
similarity index 89%
rename from test/src/helperTest.js
rename to test/src/helperTest.ts
index c1b4b0fe..2a8ddc81 100644
--- a/test/src/helperTest.js
+++ b/test/src/helperTest.ts
@@ -1,8 +1,6 @@
-"use strict";
-
-const expect = require("chai").expect;
-const os = require("os");
-const Helper = require("../../src/helper");
+import {expect} from "chai";
+import os from "os";
+import Helper from "../../server/helper";
 
 describe("Helper", function () {
 	describe("#expandHome", function () {
@@ -35,7 +33,7 @@ describe("Helper", function () {
 		});
 
 		it("should return an empty string when given undefined", function () {
-			expect(Helper.expandHome(undefined)).to.equal("");
+			expect(Helper.expandHome(undefined as any)).to.equal("");
 		});
 	});
 
diff --git a/test/tests/build.js b/test/tests/build.ts
similarity index 96%
rename from test/tests/build.js
rename to test/tests/build.ts
index f54e80c0..1f833d04 100644
--- a/test/tests/build.js
+++ b/test/tests/build.ts
@@ -1,8 +1,6 @@
-"use strict";
-
-const expect = require("chai").expect;
-const fs = require("fs");
-const path = require("path");
+import {expect} from "chai";
+import fs from "fs";
+import path from "path";
 
 describe("public folder", function () {
 	const publicFolder = path.join(__dirname, "..", "..", "public");
diff --git a/test/tests/customhighlights.js b/test/tests/customhighlights.ts
similarity index 83%
rename from test/tests/customhighlights.js
rename to test/tests/customhighlights.ts
index 64147d67..d9a8cfd4 100644
--- a/test/tests/customhighlights.js
+++ b/test/tests/customhighlights.ts
@@ -1,14 +1,13 @@
-"use strict";
-
-const expect = require("chai").expect;
-const stub = require("sinon").stub;
-const log = require("../../src/log");
-const Client = require("../../src/client");
-const TestUtil = require("../util");
+import {expect} from "chai";
+import log from "../../server/log";
+import Client from "../../server/client";
+import TestUtil from "../util";
+import sinon from "ts-sinon";
 
 describe("Custom highlights", function () {
 	let userLoadedLog = "";
-	stub(log, "info").callsFake(TestUtil.sanitizeLog((str) => (userLoadedLog += str)));
+	const logInfoStub = sinon.stub(log, "info");
+	logInfoStub.callsFake(TestUtil.sanitizeLog((str) => (userLoadedLog += str)));
 
 	const client = new Client(
 		{
@@ -19,17 +18,16 @@ describe("Custom highlights", function () {
 					newHash: "",
 				};
 			},
-		},
+		} as any,
 		"test",
 		{
 			clientSettings: {
 				highlights: "foo, @all,   sp ace   , 고",
 				highlightExceptions: "foo bar, bar @all, test sp ace test",
 			},
-		}
+		} as any
 	);
-
-	log.info.restore();
+	logInfoStub.restore();
 	expect(userLoadedLog).to.equal("User test loaded\n");
 
 	it("should NOT highlight", function () {
@@ -46,7 +44,7 @@ describe("Custom highlights", function () {
 		];
 
 		for (const teststring of teststrings) {
-			expect(teststring).to.not.match(client.highlightRegex);
+			expect(teststring).to.not.match(client.highlightRegex!);
 		}
 	});
 
@@ -81,7 +79,7 @@ describe("Custom highlights", function () {
 		];
 
 		for (const teststring of teststrings) {
-			expect(teststring).to.match(client.highlightRegex);
+			expect(teststring).to.match(client.highlightRegex!);
 		}
 	});
 
@@ -110,7 +108,7 @@ describe("Custom highlights", function () {
 		];
 
 		for (const teststring of teststrings) {
-			expect(teststring).to.match(client.highlightExceptionRegex);
+			expect(teststring).to.match(client.highlightExceptionRegex!);
 		}
 	});
 
@@ -145,7 +143,7 @@ describe("Custom highlights", function () {
 		];
 
 		for (const teststring of teststrings) {
-			expect(teststring).to.not.match(client.highlightExceptionRegex);
+			expect(teststring).to.not.match(client.highlightExceptionRegex!);
 		}
 	});
 });
diff --git a/test/tests/hexip.js b/test/tests/hexip.ts
similarity index 85%
rename from test/tests/hexip.js
rename to test/tests/hexip.ts
index 84b00b5f..3bc8d6dd 100644
--- a/test/tests/hexip.js
+++ b/test/tests/hexip.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const Helper = require("../../src/helper");
+import {expect} from "chai";
+import Helper from "../../server/helper";
 
 describe("HexIP", function () {
 	it("should correctly convert IPv4 to hex", function () {
diff --git a/test/tests/hostmask.js b/test/tests/hostmask.ts
similarity index 97%
rename from test/tests/hostmask.js
rename to test/tests/hostmask.ts
index b1e84c5e..a6c768eb 100644
--- a/test/tests/hostmask.js
+++ b/test/tests/hostmask.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const Helper = require("../../src/helper");
+import {expect} from "chai";
+import Helper from "../../server/helper";
 
 describe("Hostmask", function () {
 	it(".parseHostmask", function () {
diff --git a/test/tests/mergeConfig.js b/test/tests/mergeConfig.ts
similarity index 84%
rename from test/tests/mergeConfig.js
rename to test/tests/mergeConfig.ts
index 7a785402..570fb313 100644
--- a/test/tests/mergeConfig.js
+++ b/test/tests/mergeConfig.ts
@@ -1,21 +1,20 @@
-"use strict";
+import {expect} from "chai";
+import sinon from "ts-sinon";
 
-const log = require("../../src/log");
-const expect = require("chai").expect;
-const stub = require("sinon").stub;
-const Config = require("../../src/config");
-const TestUtil = require("../util");
+import log from "../../server/log";
+import Config from "../../server/config";
+import TestUtil from "../util";
 
 describe("mergeConfig", function () {
 	it("should mutate object", function () {
 		const config = {
 			ip: "default",
-		};
+		} as any;
 
 		expect(
 			Config._merge_config_objects(config, {
 				ip: "overridden",
-			})
+			} as any)
 		).to.deep.equal({
 			ip: "overridden",
 		});
@@ -31,10 +30,10 @@ describe("mergeConfig", function () {
 				{
 					ip: "default",
 					newProp: "this should appear too",
-				},
+				} as any,
 				{
 					ip: "overridden",
-				}
+				} as any
 			)
 		).to.deep.equal({
 			ip: "overridden",
@@ -47,13 +46,13 @@ describe("mergeConfig", function () {
 			Config._merge_config_objects(
 				{
 					tlsOptions: {},
-				},
+				} as any,
 				{
 					tlsOptions: {
 						user: "test",
 						thing: 123,
 					},
-				}
+				} as any
 			)
 		).to.deep.equal({
 			tlsOptions: {
@@ -65,24 +64,26 @@ describe("mergeConfig", function () {
 
 	it("should warn for unknown top level keys", function () {
 		let warning = "";
-		stub(log, "warn").callsFake(TestUtil.sanitizeLog((str) => (warning += str)));
+		const warnStub = sinon
+			.stub(log, "warn")
+			.callsFake(TestUtil.sanitizeLog((str) => (warning += str)));
 
 		expect(
 			Config._merge_config_objects(
 				{
 					optionOne: 123,
-				},
+				} as any,
 				{
 					optionOne: 456,
 					optionTwo: 789,
-				}
+				} as any
 			)
 		).to.deep.equal({
 			optionOne: 456,
 			optionTwo: 789,
 		});
 
-		log.warn.restore();
+		warnStub.restore();
 		expect(warning).to.equal('Unknown key "optionTwo", please verify your config.\n');
 	});
 
@@ -93,13 +94,13 @@ describe("mergeConfig", function () {
 					optionOne: {
 						subOne: 123,
 					},
-				},
+				} as any,
 				{
 					optionOne: {
 						subOne: 123,
 						subTwo: 123,
 					},
-				}
+				} as any
 			)
 		).to.deep.equal({
 			optionOne: {
@@ -114,10 +115,10 @@ describe("mergeConfig", function () {
 			Config._merge_config_objects(
 				{
 					oidentd: null,
-				},
+				} as any,
 				{
 					oidentd: "some path",
-				}
+				} as any
 			)
 		).to.deep.equal({
 			oidentd: "some path",
@@ -129,13 +130,13 @@ describe("mergeConfig", function () {
 			Config._merge_config_objects(
 				{
 					webirc: null,
-				},
+				} as any,
 				{
 					webirc: {
 						serverone: "password",
 						servertwo: "password2",
 					},
-				}
+				} as any
 			)
 		).to.deep.equal({
 			webirc: {
@@ -152,12 +153,12 @@ describe("mergeConfig", function () {
 			Config._merge_config_objects(
 				{
 					webirc: null,
-				},
+				} as any,
 				{
 					webirc: {
 						servercb: callbackFunction,
 					},
-				}
+				} as any
 			)
 		).to.deep.equal({
 			webirc: {
@@ -180,7 +181,7 @@ describe("mergeConfig", function () {
 							newThing: "but also this",
 						},
 					},
-				},
+				} as any,
 				{
 					nestedOnce: {},
 					nestedTwice: {
@@ -188,7 +189,7 @@ describe("mergeConfig", function () {
 							otherThing: "overridden",
 						},
 					},
-				}
+				} as any
 			)
 		).to.deep.equal({
 			nestedOnce: {
@@ -209,10 +210,10 @@ describe("mergeConfig", function () {
 			Config._merge_config_objects(
 				{
 					test: ["sqlite", "text"],
-				},
+				} as any,
 				{
 					test: ["sqlite"],
-				}
+				} as any
 			)
 		).to.deep.equal({
 			test: ["sqlite"],
@@ -222,10 +223,10 @@ describe("mergeConfig", function () {
 			Config._merge_config_objects(
 				{
 					test: ["sqlite", "text"],
-				},
+				} as any,
 				{
 					test: [],
-				}
+				} as any
 			)
 		).to.deep.equal({
 			test: [],
@@ -237,10 +238,10 @@ describe("mergeConfig", function () {
 			Config._merge_config_objects(
 				{
 					test: ["sqlite", "text"],
-				},
+				} as any,
 				{
 					test: ["text", "sqlite"],
-				}
+				} as any
 			)
 		).to.deep.equal({
 			test: ["text", "sqlite"],
@@ -248,7 +249,7 @@ describe("mergeConfig", function () {
 	});
 
 	it("should only merge same type", function () {
-		stub(log, "warn");
+		const logWarnStub = sinon.stub(log, "warn");
 
 		expect(
 			Config._merge_config_objects(
@@ -256,10 +257,10 @@ describe("mergeConfig", function () {
 					shouldBeObject: {
 						thing: "yes",
 					},
-				},
+				} as any,
 				{
 					shouldBeObject: "bad type",
-				}
+				} as any
 			)
 		).to.deep.equal({
 			shouldBeObject: {
@@ -271,15 +272,15 @@ describe("mergeConfig", function () {
 			Config._merge_config_objects(
 				{
 					shouldBeString: "string",
-				},
+				} as any,
 				{
 					shouldBeString: 1234567,
-				}
+				} as any
 			)
 		).to.deep.equal({
 			shouldBeString: "string",
 		});
 
-		log.warn.restore();
+		logWarnStub.restore();
 	});
 });
diff --git a/test/tests/nickhighlights.js b/test/tests/nickhighlights.js
deleted file mode 100644
index 06862c86..00000000
--- a/test/tests/nickhighlights.js
+++ /dev/null
@@ -1,63 +0,0 @@
-"use strict";
-
-const expect = require("chai").expect;
-
-const Network = require("../../src/models/network");
-
-const network = new Network({name: "networkName"});
-
-describe("Nickname highlights", function () {
-	it("should NOT highlight nickname", function () {
-		network.setNick("lounge-bot");
-
-		expect("").to.not.match(network.highlightRegex);
-		expect("  ").to.not.match(network.highlightRegex);
-		expect("completely unrelated sentence").to.not.match(network.highlightRegex);
-		expect("foobarlounge-bot").to.not.match(network.highlightRegex);
-		expect("lounge-botfoobar").to.not.match(network.highlightRegex);
-		expect("\x03123lounge-bot").to.not.match(network.highlightRegex);
-		expect("lo\x0312unge-bot").to.not.match(network.highlightRegex);
-		expect("123lounge-bot").to.not.match(network.highlightRegex);
-		expect("lounge-botz").to.not.match(network.highlightRegex);
-		expect("lounge-bot123").to.not.match(network.highlightRegex);
-		expect("lounge- bot").to.not.match(network.highlightRegex);
-		expect("lounge_bot").to.not.match(network.highlightRegex);
-		expect("lounge- bot").to.not.match(network.highlightRegex);
-		expect("Alounge-bot").to.not.match(network.highlightRegex);
-		expect("lounge-botW").to.not.match(network.highlightRegex);
-	});
-
-	it("should highlight nickname", function () {
-		network.setNick("lounge-bot");
-
-		expect("lounge-bot").to.match(network.highlightRegex);
-		expect("LoUnge-Bot").to.match(network.highlightRegex);
-		expect("LoUnge-Bot:hello").to.match(network.highlightRegex);
-		expect("lounge-bot, hello").to.match(network.highlightRegex);
-		expect("lounge-bot: hello").to.match(network.highlightRegex);
-		expect("lounge-bot hello").to.match(network.highlightRegex);
-		expect("\x0312lounge-bot").to.match(network.highlightRegex);
-		expect("lounge-bot\x0312 test").to.match(network.highlightRegex);
-		expect("|lounge-bot").to.match(network.highlightRegex);
-		expect("www.lounge-bot.example.com").to.match(network.highlightRegex);
-		expect(" lounge-bot").to.match(network.highlightRegex);
-		expect("@lounge-bot").to.match(network.highlightRegex);
-		expect("+lounge-bot").to.match(network.highlightRegex);
-		expect("lounge-bot_, hey").to.match(network.highlightRegex);
-		expect("lounge-bot-, hey").to.match(network.highlightRegex);
-		expect("lounge-bot|sleep, hey").to.match(network.highlightRegex);
-		expect("LOUNGE-bot|sleep, hey").to.match(network.highlightRegex);
-	});
-
-	it("changing name should update regex", function () {
-		network.setNick("lounge-bot");
-
-		expect("lounge-bot, hello").to.match(network.highlightRegex);
-		expect("cool_person, hello").to.not.match(network.highlightRegex);
-
-		network.setNick("cool_person");
-
-		expect("lounge-bot, hello").to.not.match(network.highlightRegex);
-		expect("cool_person, hello").to.match(network.highlightRegex);
-	});
-});
diff --git a/test/tests/nickhighlights.ts b/test/tests/nickhighlights.ts
new file mode 100644
index 00000000..dae265bc
--- /dev/null
+++ b/test/tests/nickhighlights.ts
@@ -0,0 +1,61 @@
+import {expect} from "chai";
+
+import Network from "../../server/models/network";
+
+const network = new Network({name: "networkName"});
+
+describe("Nickname highlights", function () {
+	it("should NOT highlight nickname", function () {
+		network.setNick("lounge-bot");
+
+		expect("").to.not.match(network.highlightRegex as any);
+		expect("  ").to.not.match(network.highlightRegex as any);
+		expect("completely unrelated sentence").to.not.match(network.highlightRegex as any);
+		expect("foobarlounge-bot").to.not.match(network.highlightRegex as any);
+		expect("lounge-botfoobar").to.not.match(network.highlightRegex as any);
+		expect("\x03123lounge-bot").to.not.match(network.highlightRegex as any);
+		expect("lo\x0312unge-bot").to.not.match(network.highlightRegex as any);
+		expect("123lounge-bot").to.not.match(network.highlightRegex as any);
+		expect("lounge-botz").to.not.match(network.highlightRegex as any);
+		expect("lounge-bot123").to.not.match(network.highlightRegex as any);
+		expect("lounge- bot").to.not.match(network.highlightRegex as any);
+		expect("lounge_bot").to.not.match(network.highlightRegex as any);
+		expect("lounge- bot").to.not.match(network.highlightRegex as any);
+		expect("Alounge-bot").to.not.match(network.highlightRegex as any);
+		expect("lounge-botW").to.not.match(network.highlightRegex as any);
+	});
+
+	it("should highlight nickname", function () {
+		network.setNick("lounge-bot");
+
+		expect("lounge-bot").to.match(network.highlightRegex as any);
+		expect("LoUnge-Bot").to.match(network.highlightRegex as any);
+		expect("LoUnge-Bot:hello").to.match(network.highlightRegex as any);
+		expect("lounge-bot, hello").to.match(network.highlightRegex as any);
+		expect("lounge-bot: hello").to.match(network.highlightRegex as any);
+		expect("lounge-bot hello").to.match(network.highlightRegex as any);
+		expect("\x0312lounge-bot").to.match(network.highlightRegex as any);
+		expect("lounge-bot\x0312 test").to.match(network.highlightRegex as any);
+		expect("|lounge-bot").to.match(network.highlightRegex as any);
+		expect("www.lounge-bot.example.com").to.match(network.highlightRegex as any);
+		expect(" lounge-bot").to.match(network.highlightRegex as any);
+		expect("@lounge-bot").to.match(network.highlightRegex as any);
+		expect("+lounge-bot").to.match(network.highlightRegex as any);
+		expect("lounge-bot_, hey").to.match(network.highlightRegex as any);
+		expect("lounge-bot-, hey").to.match(network.highlightRegex as any);
+		expect("lounge-bot|sleep, hey").to.match(network.highlightRegex as any);
+		expect("LOUNGE-bot|sleep, hey").to.match(network.highlightRegex as any);
+	});
+
+	it("changing name should update regex", function () {
+		network.setNick("lounge-bot");
+
+		expect("lounge-bot, hello").to.match(network.highlightRegex as any);
+		expect("cool_person, hello").to.not.match(network.highlightRegex as any);
+
+		network.setNick("cool_person");
+
+		expect("lounge-bot, hello").to.not.match(network.highlightRegex as any);
+		expect("cool_person, hello").to.match(network.highlightRegex as any);
+	});
+});
diff --git a/test/tests/passwords.js b/test/tests/passwords.ts
similarity index 93%
rename from test/tests/passwords.js
rename to test/tests/passwords.ts
index f899f908..62932811 100644
--- a/test/tests/passwords.js
+++ b/test/tests/passwords.ts
@@ -1,7 +1,5 @@
-"use strict";
-
-const expect = require("chai").expect;
-const Helper = require("../../src/helper");
+import {expect} from "chai";
+import Helper from "../../server/helper";
 
 describe("Client passwords", function () {
 	this.slow(1500);
diff --git a/test/tests/textLogFolder.js b/test/tests/textLogFolder.ts
similarity index 83%
rename from test/tests/textLogFolder.js
rename to test/tests/textLogFolder.ts
index e00d7839..ea236e1a 100644
--- a/test/tests/textLogFolder.js
+++ b/test/tests/textLogFolder.ts
@@ -1,7 +1,6 @@
-"use strict";
-
-const expect = require("chai").expect;
-const TextFileMessageStorage = require("../../src/plugins/messageStorage/text");
+import {expect} from "chai";
+import Network from "../../server/models/network";
+import TextFileMessageStorage from "../../server/plugins/messageStorage/text";
 
 describe("TextFileMessageStorage", function () {
 	it("should combine network name and uuid into a safe name", function () {
@@ -9,7 +8,7 @@ describe("TextFileMessageStorage", function () {
 			TextFileMessageStorage.getNetworkFolderName({
 				name: "Freenode",
 				uuid: "f9042ec9-4016-45e0-a8a8-d378fb252628",
-			})
+			} as Network)
 		).to.equal("freenode-4016-45e0-a8a8-d378fb252628");
 	});
 
@@ -18,7 +17,7 @@ describe("TextFileMessageStorage", function () {
 			TextFileMessageStorage.getNetworkFolderName({
 				name: '@ TeSt ../..\\<>:"/\\|?*',
 				uuid: "f9042ec9-4016-45e0-a8a8-d378fb252628",
-			})
+			} as Network)
 		).to.equal("@-test-.._..--45e0-a8a8-d378fb252628");
 	});
 
@@ -27,7 +26,7 @@ describe("TextFileMessageStorage", function () {
 			TextFileMessageStorage.getNetworkFolderName({
 				name: "Freenod",
 				uuid: "f9042ec9-4016-45e0-a8a8-d378fb252628",
-			})
+			} as Network)
 		).to.equal("freenod--4016-45e0-a8a8-d378fb252628");
 	});
 
@@ -36,7 +35,7 @@ describe("TextFileMessageStorage", function () {
 			TextFileMessageStorage.getNetworkFolderName({
 				name: "This network name is longer than the uuid itself but it should be limited",
 				uuid: "f9042ec9-4016-45e0-a8a8-d378fb252628",
-			})
+			} as Network)
 		).to.equal("this-network-name-is-lo-d378fb252628");
 	});
 });
diff --git a/test/tsconfig.json b/test/tsconfig.json
new file mode 100644
index 00000000..27207ccc
--- /dev/null
+++ b/test/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "extends": "../tsconfig.base.json" /* Path to base configuration file to inherit from. Requires TypeScript version 2.1 or later. */,
+  "include": [
+    "**/*",
+    "../client",
+    "../server"
+  ] /* Specifies a list of glob patterns that match files to be included in compilation. If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. Requires TypeScript version 2.0 or later. */,
+  "files": [
+    "../babel.config.cjs",
+    "../server/helper.ts",
+    "../server/index.d.ts",
+    "../package.json"
+  ] /* If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. When a 'files' property is specified, only those files and those specified by 'include' are included. */,
+  "ts-node": {
+    "files": true
+  },
+  "compilerOptions": {
+    "jsx": "preserve" /* Specify what JSX code is generated. */,
+
+    // TODO: Remove eventually
+    "noImplicitAny": false /*Enable error reporting for expressions and declarations with an implied any type. See more: https://www.typescriptlang.org/tsconfig#noImplicitAny */
+  } /* Instructs the TypeScript compiler how to compile .ts files. */
+}
diff --git a/test/util.js b/test/util.js
deleted file mode 100644
index c33f32a9..00000000
--- a/test/util.js
+++ /dev/null
@@ -1,67 +0,0 @@
-"use strict";
-
-const EventEmitter = require("events").EventEmitter;
-const util = require("util");
-const _ = require("lodash");
-const express = require("express");
-const Network = require("../src/models/network");
-const Chan = require("../src/models/chan");
-
-function MockClient() {
-	this.config = {
-		browser: {},
-	};
-}
-
-util.inherits(MockClient, EventEmitter);
-
-MockClient.prototype.createMessage = function (opts) {
-	const message = _.extend(
-		{
-			text: "dummy message",
-			nick: "test-user",
-			target: "#test-channel",
-			previews: [],
-		},
-		opts
-	);
-
-	return message;
-};
-
-function sanitizeLog(callback) {
-	return function (...args) {
-		// Concats and removes ANSI colors. See https://stackoverflow.com/a/29497680
-		const stdout = args
-			.join(" ")
-			.replace(
-				/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
-				""
-			);
-
-		callback(stdout + "\n");
-	};
-}
-
-module.exports = {
-	createClient() {
-		return new MockClient();
-	},
-	createNetwork() {
-		return new Network({
-			host: "example.com",
-			channels: [
-				new Chan({
-					name: "#test-channel",
-				}),
-			],
-		});
-	},
-	createWebserver() {
-		return express();
-	},
-	sanitizeLog,
-	isRunningOnCI() {
-		return process.env.CI || process.env.GITHUB_ACTIONS;
-	},
-};
diff --git a/test/util.ts b/test/util.ts
new file mode 100644
index 00000000..32b128c0
--- /dev/null
+++ b/test/util.ts
@@ -0,0 +1,71 @@
+import _ from "lodash";
+import express from "express";
+import Network from "../server/models/network";
+import Chan from "../server/models/chan";
+import {EventEmitter} from "events";
+import {Message} from "../server/models/msg";
+
+class MockClient extends EventEmitter {
+	config: {
+		browser: any;
+	};
+
+	constructor() {
+		super();
+
+		this.config = {
+			browser: {},
+		};
+	}
+
+	createMessage(opts: any) {
+		const message = _.extend(
+			{
+				text: "dummy message",
+				nick: "test-user",
+				target: "#test-channel",
+				previews: [],
+			},
+			opts
+		) as Message;
+
+		return message;
+	}
+}
+
+function sanitizeLog(callback: (log: string) => void) {
+	return function (...args: string[]) {
+		// Concats and removes ANSI colors. See https://stackoverflow.com/a/29497680
+		const stdout = args
+			.join(" ")
+			.replace(
+				/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
+				""
+			);
+
+		callback(stdout + "\n");
+	};
+}
+
+export default {
+	createClient() {
+		return new MockClient();
+	},
+	createNetwork() {
+		return new Network({
+			host: "example.com",
+			channels: [
+				new Chan({
+					name: "#test-channel",
+				}),
+			],
+		});
+	},
+	createWebserver() {
+		return express();
+	},
+	sanitizeLog,
+	isRunningOnCI() {
+		return process.env.CI || process.env.GITHUB_ACTIONS;
+	},
+};
diff --git a/tsconfig.base.json b/tsconfig.base.json
new file mode 100644
index 00000000..04ea3e1d
--- /dev/null
+++ b/tsconfig.base.json
@@ -0,0 +1,104 @@
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+    /* Projects */
+    // "incremental": true,                              /* Enable incremental compilation */
+    "composite": true /* Enable constraints that allow a TypeScript project to be used with project references. */,
+    // "tsBuildInfoFile": "./",                          /* Specify the folder for .tsbuildinfo incremental compilation files. */
+    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects */
+    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
+    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
+
+    /* Language and Environment */
+    "target": "esnext" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
+    // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
+    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
+    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */
+    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
+    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */
+    // "reactNamespace": "",                             /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */
+    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
+    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
+
+    /* Modules */
+    "module": "commonjs" /* Specify what module code is generated. */,
+    "rootDir": "./" /* Specify the root folder within your source files. */,
+    "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
+    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
+    // "typeRoots": [],                                  /* Specify multiple folders that act like `./node_modules/@types`. */
+    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
+    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
+    "resolveJsonModule": true /* Enable importing .json files */,
+    // "noResolve": true,                                /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */
+
+    /* JavaScript Support */
+    "allowJs": true /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */,
+    "checkJs": true /* Enable error reporting in type-checked JavaScript files. */,
+    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */
+
+    /* Emit */
+    "declaration": true /* Generate .d.ts files from TypeScript and JavaScript files in your project. */,
+    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
+    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
+    // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
+    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
+    /* outDir is necessary because otherwise the built output for files like babel.config.cjs would overwrite the input. */
+    "outDir": "./dist" /* Specify an output folder for all emitted files. */,
+    // "removeComments": true,                           /* Disable emitting comments. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
+    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
+    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
+    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
+    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
+    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
+    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
+    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
+    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
+    // "stripInternal": true,                            /* Disable emitting declarations that have `@internal` in their JSDoc comments. */
+    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like `__extends` in compiled output. */
+    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
+    // "preserveConstEnums": true,                       /* Disable erasing `const enum` declarations in generated code. */
+    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
+    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
+
+    /* Interop Constraints */
+    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
+    "allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */,
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
+    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
+
+    /* Type Checking */
+    "strict": true /* Enable all strict type-checking options. */,
+    // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied `any` type.. */
+    // "strictNullChecks": true,                         /* When type checking, take into account `null` and `undefined`. */
+    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
+    // "strictBindCallApply": true,                      /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */
+    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
+    // "noImplicitThis": true,                           /* Enable error reporting when `this` is given the type `any`. */
+    // "useUnknownInCatchVariables": true,               /* Type catch clause variables as 'unknown' instead of 'any'. */
+    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
+    // "noUnusedLocals": true,                           /* Enable error reporting when a local variables aren't read. */
+    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read */
+    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
+    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
+    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
+    // "noUncheckedIndexedAccess": true,                 /* Include 'undefined' in index signature results */
+    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
+    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type */
+    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
+    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
+
+    /* Completeness */
+    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
+  },
+  "files": ["./package.json", "./server/helper.ts"],
+  "exclude": ["./dist"]
+}
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000..fe1b0c3a
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.base.json" /* Path to base configuration file to inherit from. Requires TypeScript version 2.1 or later. */,
+  "files": [
+    "./webpack.config.ts",
+    "./babel.config.cjs"
+  ] /* If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. When a 'files' property is specified, only those files and those specified by 'include' are included. */,
+  // "exclude": [],
+  "references": [
+    {
+      "path": "./client" /* Path to referenced tsconfig or to folder containing tsconfig. */
+    },
+    {
+      "path": "./server" /* Path to referenced tsconfig or to folder containing tsconfig. */
+    }
+  ] /* Referenced projects. Requires TypeScript version 3.0 or later. */,
+  "compilerOptions": {
+    // TODO: Remove eventually
+    "noImplicitAny": false /*Enable error reporting for expressions and declarations with an implied any type. See more: https://www.typescriptlang.org/tsconfig#noImplicitAny */
+  } /* Instructs the TypeScript compiler how to compile .ts files. */
+}
diff --git a/volar.config.js b/volar.config.js
new file mode 100644
index 00000000..3afec77f
--- /dev/null
+++ b/volar.config.js
@@ -0,0 +1,14 @@
+/** @type {import('@volar-plugins/prettier')} */
+const {volarPrettierPlugin} = require("@volar-plugins/prettier");
+
+module.exports = {
+	plugins: [
+		volarPrettierPlugin({
+			languages: ["html", "css", "scss", "typescript", "javascript"],
+			html: {
+				breakContentsFromTags: true,
+			},
+			useVscodeIndentation: true,
+		}),
+	],
+};
diff --git a/webpack.config.js b/webpack.config.ts
similarity index 61%
rename from webpack.config.js
rename to webpack.config.ts
index 018533a5..2c412c73 100644
--- a/webpack.config.js
+++ b/webpack.config.ts
@@ -1,18 +1,16 @@
-"use strict";
-
-const webpack = require("webpack");
-const path = require("path");
-const CopyPlugin = require("copy-webpack-plugin");
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const VueLoaderPlugin = require("vue-loader/lib/plugin");
-const Helper = require("./src/helper.js");
-const babelConfig = require("./babel.config.cjs");
+import * as webpack from "webpack";
+import * as path from "path";
+import CopyPlugin from "copy-webpack-plugin";
+import MiniCssExtractPlugin from "mini-css-extract-plugin";
+import {VueLoaderPlugin} from "vue-loader";
+import babelConfig from "./babel.config.cjs";
+import Helper from "./server/helper";
 
 const isProduction = process.env.NODE_ENV === "production";
-const config = {
+const config: webpack.Configuration = {
 	mode: isProduction ? "production" : "development",
 	entry: {
-		"js/bundle.js": [path.resolve(__dirname, "client/js/vue.js")],
+		"js/bundle.js": [path.resolve(__dirname, "client/js/vue.ts")],
 	},
 	devtool: "source-map",
 	output: {
@@ -24,6 +22,9 @@ const config = {
 	performance: {
 		hints: false,
 	},
+	resolve: {
+		extensions: [".ts", ".js", ".vue"],
+	},
 	module: {
 		rules: [
 			{
@@ -34,9 +35,19 @@ const config = {
 						compilerOptions: {
 							preserveWhitespace: false,
 						},
+						appendTsSuffixTo: [/\.vue$/],
 					},
 				},
 			},
+			{
+				test: /\.ts$/i,
+				include: [path.resolve(__dirname, "client")],
+				exclude: path.resolve(__dirname, "node_modules"),
+				use: {
+					loader: "babel-loader",
+					options: babelConfig,
+				},
+			},
 			{
 				test: /\.css$/,
 				use: [
@@ -62,14 +73,6 @@ const config = {
 					},
 				],
 			},
-			{
-				test: /\.js$/,
-				include: [path.resolve(__dirname, "client")],
-				use: {
-					loader: "babel-loader",
-					options: babelConfig,
-				},
-			},
 		],
 	},
 	optimization: {
@@ -88,28 +91,42 @@ const config = {
 	},
 	plugins: [
 		new VueLoaderPlugin(),
+		new webpack.DefinePlugin({
+			__VUE_PROD_DEVTOOLS__: false,
+			__VUE_OPTIONS_API__: false,
+		}),
 		new MiniCssExtractPlugin({
 			filename: "css/style.css",
 		}),
 		new CopyPlugin({
 			patterns: [
 				{
-					from: "./node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff*",
+					from: path
+						.resolve(
+							__dirname,
+							"node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff*"
+						)
+						.replace(/\\/g, "/"),
 					to: "fonts/[name][ext]",
 				},
 				{
-					from: "./client/js/loading-error-handlers.js",
+					from: path.resolve(__dirname, "./client/js/loading-error-handlers.js"),
 					to: "js/[name][ext]",
 				},
 				{
-					from: "./client/*",
+					from: path.resolve(__dirname, "./client/*").replace(/\\/g, "/"),
 					to: "[name][ext]",
 					globOptions: {
-						ignore: ["**/index.html.tpl", "**/service-worker.js"],
+						ignore: [
+							"**/index.html.tpl",
+							"**/service-worker.js",
+							"**/*.d.ts",
+							"**/tsconfig.json",
+						],
 					},
 				},
 				{
-					from: "./client/service-worker.js",
+					from: path.resolve(__dirname, "./client/service-worker.js"),
 					to: "[name][ext]",
 					transform(content) {
 						return content
@@ -121,15 +138,15 @@ const config = {
 					},
 				},
 				{
-					from: "./client/audio/*",
+					from: path.resolve(__dirname, "./client/audio/*").replace(/\\/g, "/"),
 					to: "audio/[name][ext]",
 				},
 				{
-					from: "./client/img/*",
+					from: path.resolve(__dirname, "./client/img/*").replace(/\\/g, "/"),
 					to: "img/[name][ext]",
 				},
 				{
-					from: "./client/themes/*",
+					from: path.resolve(__dirname, "./client/themes/*").replace(/\\/g, "/"),
 					to: "themes/[name][ext]",
 				},
 			],
@@ -142,19 +159,19 @@ const config = {
 	],
 };
 
-module.exports = (env, argv) => {
+export default (env: any, argv: any) => {
 	if (argv.mode === "development") {
 		config.target = "node";
 		config.devtool = "eval";
 		config.stats = "errors-only";
-		config.output.path = path.resolve(__dirname, "test/public");
-		config.entry = {
-			"testclient.js": [path.resolve(__dirname, "test/client/index.js")],
-		};
+		config.output!.path = path.resolve(__dirname, "test/public");
+		config.entry!["testclient.js"] = [path.resolve(__dirname, "test/client/index.ts")];
 
 		// Add the istanbul plugin to babel-loader options
-		for (const rule of config.module.rules) {
+		for (const rule of config.module!.rules!) {
+			// @ts-expect-error Property 'use' does not exist on type 'RuleSetRule | "..."'.
 			if (rule.use.loader === "babel-loader") {
+				// @ts-expect-error Property 'use' does not exist on type 'RuleSetRule | "..."'.
 				rule.use.options.plugins = ["istanbul"];
 			}
 		}
@@ -162,7 +179,7 @@ module.exports = (env, argv) => {
 		// `optimization.splitChunks` is incompatible with a `target` of `node`. See:
 		// - https://github.com/zinserjan/mocha-webpack/issues/84
 		// - https://github.com/webpack/webpack/issues/6727#issuecomment-372589122
-		config.optimization.splitChunks = false;
+		config.optimization!.splitChunks = false;
 
 		// Disable plugins like copy files, it is not required
 		config.plugins = [
@@ -175,13 +192,10 @@ module.exports = (env, argv) => {
 				/js(\/|\\)socket\.js/,
 				path.resolve(__dirname, "scripts/noop.js")
 			),
-
-			// "Fixes" Critical dependency: the request of a dependency is an expression
-			new webpack.ContextReplacementPlugin(/vue-server-renderer$/),
 		];
 	}
 
-	if (argv.mode === "production") {
+	if (argv?.mode === "production") {
 		// ...
 	}
 
diff --git a/yarn.lock b/yarn.lock
index b65c5a5a..e4916b03 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,11 +3,12 @@
 
 
 "@ampproject/remapping@^2.1.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
-  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
+  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.0"
+    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
   version "7.16.7"
@@ -16,12 +17,7 @@
   dependencies:
     "@babel/highlight" "^7.16.7"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2"
-  integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==
-
-"@babel/compat-data@^7.17.10":
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.17.10":
   version "7.17.10"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab"
   integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==
@@ -48,44 +44,35 @@
     semver "^6.3.0"
 
 "@babel/core@^7.12.3", "@babel/core@^7.7.5":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe"
-  integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz#87b2fcd7cce9becaa7f5acebdc4f09f3dd19d876"
+  integrity sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.9"
-    "@babel/helper-compilation-targets" "^7.17.7"
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helpers" "^7.17.9"
-    "@babel/parser" "^7.17.9"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-compilation-targets" "^7.18.2"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helpers" "^7.18.2"
+    "@babel/parser" "^7.18.0"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.9"
-    "@babel/types" "^7.17.0"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.10.tgz#c281fa35b0c349bbe9d02916f4ae08fc85ed7189"
-  integrity sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==
+"@babel/generator@^7.17.10", "@babel/generator@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d"
+  integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==
   dependencies:
-    "@babel/types" "^7.17.10"
-    "@jridgewell/gen-mapping" "^0.1.0"
+    "@babel/types" "^7.18.2"
+    "@jridgewell/gen-mapping" "^0.3.0"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc"
-  integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==
-  dependencies:
-    "@babel/types" "^7.17.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
@@ -101,30 +88,20 @@
     "@babel/helper-explode-assignable-expression" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46"
-  integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==
-  dependencies:
-    "@babel/compat-data" "^7.17.7"
-    "@babel/helper-validator-option" "^7.16.7"
-    browserslist "^4.17.5"
-    semver "^6.3.0"
-
-"@babel/helper-compilation-targets@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz#09c63106d47af93cf31803db6bc49fef354e2ebe"
-  integrity sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.10", "@babel/helper-compilation-targets@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz#67a85a10cbd5fc7f1457fec2e7f45441dc6c754b"
+  integrity sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==
   dependencies:
     "@babel/compat-data" "^7.17.10"
     "@babel/helper-validator-option" "^7.16.7"
     browserslist "^4.20.2"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d"
-  integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==
+"@babel/helper-create-class-features-plugin@^7.17.12", "@babel/helper-create-class-features-plugin@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz#fac430912606331cb075ea8d82f9a4c145a4da19"
+  integrity sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
     "@babel/helper-environment-visitor" "^7.16.7"
@@ -134,10 +111,10 @@
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
 
-"@babel/helper-create-regexp-features-plugin@^7.16.7", "@babel/helper-create-regexp-features-plugin@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1"
-  integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==
+"@babel/helper-create-regexp-features-plugin@^7.16.7", "@babel/helper-create-regexp-features-plugin@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz#bb37ca467f9694bbe55b884ae7a5cc1e0084e4fd"
+  integrity sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
     regexpu-core "^5.0.1"
@@ -156,12 +133,10 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
-  dependencies:
-    "@babel/types" "^7.16.7"
+"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd"
+  integrity sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==
 
 "@babel/helper-explode-assignable-expression@^7.16.7":
   version "7.16.7"
@@ -185,7 +160,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
+"@babel/helper-member-expression-to-functions@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
   integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
@@ -199,10 +174,10 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd"
-  integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==
+"@babel/helper-module-transforms@^7.17.7", "@babel/helper-module-transforms@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd"
+  integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==
   dependencies:
     "@babel/helper-environment-visitor" "^7.16.7"
     "@babel/helper-module-imports" "^7.16.7"
@@ -210,8 +185,8 @@
     "@babel/helper-split-export-declaration" "^7.16.7"
     "@babel/helper-validator-identifier" "^7.16.7"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
+    "@babel/traverse" "^7.18.0"
+    "@babel/types" "^7.18.0"
 
 "@babel/helper-optimise-call-expression@^7.16.7":
   version "7.16.7"
@@ -220,10 +195,10 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
-  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.17.12", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96"
+  integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==
 
 "@babel/helper-remap-async-to-generator@^7.16.8":
   version "7.16.8"
@@ -234,23 +209,23 @@
     "@babel/helper-wrap-function" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helper-replace-supers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
-  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
+"@babel/helper-replace-supers@^7.16.7", "@babel/helper-replace-supers@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz#41fdfcc9abaf900e18ba6e5931816d9062a7b2e0"
+  integrity sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.18.2"
+    "@babel/helper-member-expression-to-functions" "^7.17.7"
     "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
 
-"@babel/helper-simple-access@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
-  integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==
+"@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz#4dc473c2169ac3a1c9f4a51cfcd091d1c36fcff9"
+  integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@babel/types" "^7.18.2"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
   version "7.16.0"
@@ -286,74 +261,69 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a"
-  integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==
+"@babel/helpers@^7.17.9", "@babel/helpers@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz#970d74f0deadc3f5a938bfa250738eb4ac889384"
+  integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==
   dependencies:
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.9"
-    "@babel/types" "^7.17.0"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
 
 "@babel/highlight@^7.16.7":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3"
-  integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.12.tgz#257de56ee5afbd20451ac0a75686b6b404257351"
+  integrity sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==
   dependencies:
     "@babel/helper-validator-identifier" "^7.16.7"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef"
-  integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==
-
-"@babel/parser@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.10.tgz#873b16db82a8909e0fbd7f115772f4b739f6ce78"
-  integrity sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ==
+"@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.16.7", "@babel/parser@^7.17.10", "@babel/parser@^7.18.0":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef"
+  integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
-  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e"
+  integrity sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
-  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz#0d498ec8f0374b1e2eb54b9cb2c4c78714c77753"
+  integrity sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+    "@babel/plugin-proposal-optional-chaining" "^7.17.12"
 
 "@babel/plugin-proposal-async-generator-functions@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
-  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz#094a417e31ce7e692d84bab06c8e2a607cbeef03"
+  integrity sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
 "@babel/plugin-proposal-class-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
-  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz#84f65c0cc247d46f40a6da99aadd6438315d80a4"
+  integrity sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-proposal-class-static-block@^7.17.6":
-  version "7.17.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c"
-  integrity sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz#7d02253156e3c3793bdb9f2faac3a1c05f0ba710"
+  integrity sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.6"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
 "@babel/plugin-proposal-dynamic-import@^7.16.7":
@@ -365,35 +335,35 @@
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
 "@babel/plugin-proposal-export-namespace-from@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
-  integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz#b22864ccd662db9606edb2287ea5fd1709f05378"
+  integrity sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
 "@babel/plugin-proposal-json-strings@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
-  integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz#f4642951792437233216d8c1af370bb0fbff4664"
+  integrity sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
 "@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
-  integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz#c64a1bcb2b0a6d0ed2ff674fd120f90ee4b88a23"
+  integrity sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
-  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz#1e93079bbc2cbc756f6db6a1925157c4a92b94be"
+  integrity sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
 "@babel/plugin-proposal-numeric-separator@^7.16.7":
@@ -405,15 +375,15 @@
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
 "@babel/plugin-proposal-object-rest-spread@^7.17.3":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390"
-  integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz#79f2390c892ba2a68ec112eb0d895cfbd11155e8"
+  integrity sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==
   dependencies:
-    "@babel/compat-data" "^7.17.0"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/compat-data" "^7.17.10"
+    "@babel/helper-compilation-targets" "^7.17.10"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.16.7"
+    "@babel/plugin-transform-parameters" "^7.17.12"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.16.7":
   version "7.16.7"
@@ -423,40 +393,40 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
-  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
+"@babel/plugin-proposal-optional-chaining@^7.16.7", "@babel/plugin-proposal-optional-chaining@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz#f96949e9bacace3a9066323a5cf90cfb9de67174"
+  integrity sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
 "@babel/plugin-proposal-private-methods@^7.16.11":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
-  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz#c2ca3a80beb7539289938da005ad525a038a819c"
+  integrity sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.10"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-proposal-private-property-in-object@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
-  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d"
+  integrity sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
 "@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
-  integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz#3dbd7a67bd7f94c8238b394da112d86aaf32ad4d"
+  integrity sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -556,20 +526,27 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
-  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
+"@babel/plugin-syntax-typescript@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz#b54fc3be6de734a56b87508f99d6428b5b605a7b"
+  integrity sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-arrow-functions@^7.16.7":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz#dddd783b473b1b1537ef46423e3944ff24898c45"
+  integrity sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
-  integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz#dbe5511e6b01eee1496c944e35cdfe3f58050832"
+  integrity sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==
   dependencies:
     "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-remap-async-to-generator" "^7.16.8"
 
 "@babel/plugin-transform-block-scoped-functions@^7.16.7":
@@ -580,39 +557,39 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-block-scoping@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
-  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz#7988627b3e9186a13e4d7735dc9c34a056613fb9"
+  integrity sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-classes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
-  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz#51310b812a090b846c784e47087fa6457baef814"
+  integrity sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.18.2"
+    "@babel/helper-function-name" "^7.17.9"
     "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-replace-supers" "^7.18.2"
     "@babel/helper-split-export-declaration" "^7.16.7"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
-  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz#bca616a83679698f3258e892ed422546e531387f"
+  integrity sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-destructuring@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1"
-  integrity sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz#dc4f92587e291b4daa78aa20cc2d7a63aa11e858"
+  integrity sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.16.7"
@@ -623,11 +600,11 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-duplicate-keys@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
-  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz#a09aa709a3310013f8e48e0e23bc7ace0f21477c"
+  integrity sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-exponentiation-operator@^7.16.7":
   version "7.16.7"
@@ -638,11 +615,11 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-for-of@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
-  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
+  version "7.18.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz#ed14b657e162b72afbbb2b4cdad277bf2bb32036"
+  integrity sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-function-name@^7.16.7":
   version "7.16.7"
@@ -654,11 +631,11 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
-  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz#97131fbc6bbb261487105b4b3edbf9ebf9c830ae"
+  integrity sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-member-expression-literals@^7.16.7":
   version "7.16.7"
@@ -668,56 +645,57 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-modules-amd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
-  integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz#7ef1002e67e36da3155edc8bf1ac9398064c02ed"
+  integrity sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-commonjs@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6"
-  integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz#1aa8efa2e2a6e818b6a7f2235fceaf09bdb31e9e"
+  integrity sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-simple-access" "^7.17.7"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-simple-access" "^7.18.2"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-systemjs@^7.17.8":
-  version "7.17.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859"
-  integrity sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz#3d6fd9868c735cce8f38d6ae3a407fb7e61e6d46"
+  integrity sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==
   dependencies:
     "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-validator-identifier" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-umd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
-  integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz#56aac64a2c2a1922341129a4597d1fd5c3ff020f"
+  integrity sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.10.tgz#715dbcfafdb54ce8bccd3d12e8917296a4ba66a4"
-  integrity sha512-v54O6yLaJySCs6mGzaVOUw9T967GnH38T6CQSAtnzdNPwu84l2qAjssKzo/WSO8Yi7NF+7ekm5cVbF/5qiIgNA==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz#9c4a5a5966e0434d515f2675c227fd8cc8606931"
+  integrity sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.17.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-new-target@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
-  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz#10842cd605a620944e81ea6060e9e65c265742e3"
+  integrity sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-object-super@^7.16.7":
   version "7.16.7"
@@ -727,12 +705,12 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-replace-supers" "^7.16.7"
 
-"@babel/plugin-transform-parameters@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
-  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
+"@babel/plugin-transform-parameters@^7.16.7", "@babel/plugin-transform-parameters@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz#eb467cd9586ff5ff115a9880d6fdbd4a846b7766"
+  integrity sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-property-literals@^7.16.7":
   version "7.16.7"
@@ -742,18 +720,31 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-regenerator@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz#0a33c3a61cf47f45ed3232903683a0afd2d3460c"
-  integrity sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz#44274d655eb3f1af3f3a574ba819d3f48caf99d5"
+  integrity sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==
   dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
     regenerator-transform "^0.15.0"
 
 "@babel/plugin-transform-reserved-words@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
-  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz#7dbd349f3cdffba751e817cf40ca1386732f652f"
+  integrity sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-runtime@7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.2.tgz#04637de1e45ae8847ff14b9beead09c33d34374d"
+  integrity sha512-mr1ufuRMfS52ttq+1G1PD8OJNqgcTFjq3hwn8SZ5n1x1pBhi0E36rYMdTK0TsKtApJ4lDEdfXJwtGobQMHSMPg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    babel-plugin-polyfill-corejs2 "^0.3.0"
+    babel-plugin-polyfill-corejs3 "^0.5.0"
+    babel-plugin-polyfill-regenerator "^0.3.0"
+    semver "^6.3.0"
 
 "@babel/plugin-transform-shorthand-properties@^7.16.7":
   version "7.16.7"
@@ -763,11 +754,11 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-spread@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
-  integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz#c112cad3064299f03ea32afed1d659223935d1f5"
+  integrity sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
 
 "@babel/plugin-transform-sticky-regex@^7.16.7":
@@ -778,18 +769,27 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-template-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
-  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz#31ed6915721864847c48b656281d0098ea1add28"
+  integrity sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-typeof-symbol@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
-  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz#0f12f57ac35e98b35b4ed34829948d42bd0e6889"
+  integrity sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
+
+"@babel/plugin-transform-typescript@^7.17.12", "@babel/plugin-transform-typescript@^7.3.2":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz#587eaf6a39edb8c06215e550dc939faeadd750bf"
+  integrity sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/plugin-syntax-typescript" "^7.17.12"
 
 "@babel/plugin-transform-unicode-escapes@^7.16.7":
   version "7.16.7"
@@ -897,10 +897,19 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
+"@babel/preset-typescript@^7.3.3":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz#40269e0a0084d56fc5731b6c40febe1c9a4a3e8c"
+  integrity sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-validator-option" "^7.16.7"
+    "@babel/plugin-transform-typescript" "^7.17.12"
+
 "@babel/runtime@^7.8.4":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
-  integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
+  integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -913,53 +922,41 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d"
-  integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.10", "@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.2.tgz#b77a52604b5cc836a9e1e08dca01cba67a12d2e8"
+  integrity sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==
   dependencies:
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.9"
-    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-environment-visitor" "^7.18.2"
     "@babel/helper-function-name" "^7.17.9"
     "@babel/helper-hoist-variables" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.17.9"
-    "@babel/types" "^7.17.0"
+    "@babel/parser" "^7.18.0"
+    "@babel/types" "^7.18.2"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.10.tgz#1ee1a5ac39f4eac844e6cf855b35520e5eb6f8b5"
-  integrity sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.10"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.17.10"
-    "@babel/types" "^7.17.10"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
-  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.10", "@babel/types@^7.18.0", "@babel/types@^7.18.2", "@babel/types@^7.4.4":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354"
+  integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==
   dependencies:
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.10.tgz#d35d7b4467e439fcf06d195f8100e0fea7fc82c4"
-  integrity sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==
+"@cspotcode/source-map-consumer@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
+  integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==
+
+"@cspotcode/source-map-support@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5"
+  integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    to-fast-properties "^2.0.0"
+    "@cspotcode/source-map-consumer" "0.8.0"
 
 "@csstools/postcss-font-format-keywords@^1.0.0":
   version "1.0.0"
@@ -969,17 +966,18 @@
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-hwb-function@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.0.tgz#d6785c1c5ba8152d1d392c66f3a6a446c6034f6d"
-  integrity sha512-VSTd7hGjmde4rTj1rR30sokY3ONJph1reCBTUXqeW1fKwETPy1x4t/XIeaaqbMbC5Xg4SM/lyXZ2S8NELT2TaA==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.1.tgz#5224db711ed09a965f85c80c18144ac1c2702fce"
+  integrity sha512-AMZwWyHbbNLBsDADWmoXT9A5yl5dsGEBeJSJRUJt8Y9n8Ziu7Wstt4MC8jtPW7xjcLecyfJwtnUTNSmOzcnWeg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-is-pseudo-class@^2.0.0":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.2.tgz#a834ca11a43d6ed9bc9e3ff53c80d490a4b1aaad"
-  integrity sha512-L9h1yxXMj7KpgNzlMrw3isvHJYkikZgZE4ASwssTnGEH8tm50L6QsM9QQT5wR4/eO5mU0rN5axH7UzNxEYg5CA==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.5.tgz#60fea78776fc3916ad66d568064aa31029b9f772"
+  integrity sha512-Ek+UFI4UP2hB9u0N1cJd6KgSF1rL0J3PT4is0oSStuus8+WzbGGPyJNMOKQ0w/tyPjxiCnOI4RdSMZt3nks64g==
   dependencies:
+    "@csstools/selector-specificity" "^2.0.0"
     postcss-selector-parser "^6.0.10"
 
 "@csstools/postcss-normalize-display-values@^1.0.0":
@@ -996,24 +994,29 @@
   dependencies:
     postcss-value-parser "^4.2.0"
 
+"@csstools/selector-specificity@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.0.tgz#65b12f12db55188422070e34687bf3af09870922"
+  integrity sha512-rZ6vufeY/UjAgtyiJ4WvfF6XP6HizIyOfbZOg0RnecIwjrvH8Am3nN1BpKnnPZunYAkUcPPXDhwbxOtGop8cfQ==
+
 "@discoveryjs/json-ext@^0.5.0":
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@eslint/eslintrc@^1.0.5":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6"
-  integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==
+"@eslint/eslintrc@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
+  integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.1"
-    globals "^13.9.0"
+    espree "^9.3.2"
+    globals "^13.15.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
 "@fastify/busboy@1.0.0":
@@ -1058,6 +1061,13 @@
     js-yaml "^3.13.1"
     resolve-from "^5.0.0"
 
+"@istanbuljs/nyc-config-typescript@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/nyc-config-typescript/-/nyc-config-typescript-1.0.2.tgz#1f5235b28540a07219ae0dd42014912a0b19cf89"
+  integrity sha512-iKGIyMoyJuFnJRSVTZ78POIRvNnwZaWIf8vG4ZS3rQq58MMDrqEX2nnzx0R28V2X8JvmKYiqY9FP2hlJsm8A0w==
+  dependencies:
+    "@istanbuljs/schema" "^0.1.2"
+
 "@istanbuljs/schema@^0.1.2":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
@@ -1071,25 +1081,42 @@
     "@jridgewell/set-array" "^1.0.0"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9"
+  integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
-  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe"
+  integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==
 
 "@jridgewell/set-array@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.0.tgz#1179863356ac8fbea64a5a4bcde93a4871012c01"
-  integrity sha512-SfJxIxNVYLTsKwzB3MoOQ1yxf4w/E6MdkvTgrgAt1bfxjSrLUoHMKrDOykwN14q65waezZIdqDneUIPh4/sKxg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea"
+  integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==
+
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
 
 "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.11"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
-  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+  version "1.4.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
+  integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
 
-"@jridgewell/trace-mapping@^0.3.0":
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
-  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
+"@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
+  integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
@@ -1151,7 +1178,7 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
   integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
-"@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.3":
+"@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.1", "@sinonjs/commons@^1.8.3":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
   integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
@@ -1165,6 +1192,22 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@sinonjs/fake-timers@^6.0.0", "@sinonjs/fake-timers@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
+  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
+"@sinonjs/samsam@^5.3.1":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.1.tgz#375a45fe6ed4e92fca2fb920e007c48232a6507f"
+  integrity sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==
+  dependencies:
+    "@sinonjs/commons" "^1.6.0"
+    lodash.get "^4.4.2"
+    type-detect "^4.0.8"
+
 "@sinonjs/samsam@^6.1.1":
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-6.1.1.tgz#627f7f4cbdb56e6419fa2c1a3e4751ce4f6a00b1"
@@ -1179,11 +1222,6 @@
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
   integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
-"@socket.io/base64-arraybuffer@~1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#568d9beae00b0d835f4f8c53fd55714986492e61"
-  integrity sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==
-
 "@socket.io/component-emitter@~3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz#8863915676f837d9dad7b76f50cb500c1e9422e9"
@@ -1196,10 +1234,10 @@
   dependencies:
     defer-to-connect "^2.0.0"
 
-"@textcomplete/core@0.1.11":
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/@textcomplete/core/-/core-0.1.11.tgz#93d0a76cbb205567e70da5a29331ad5e7b108c4c"
-  integrity sha512-zNp6oWpy1fw+/ayviQxKhRLv8FuCgyTfZlFHTavtgr5tDz13mD2lbHYKPpYdftAKfu5oMeImpbmyuYwXV4uq/A==
+"@textcomplete/core@0.1.10":
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/@textcomplete/core/-/core-0.1.10.tgz#80211c20f28a378cc9ee8b6633ddf2034785d8c3"
+  integrity sha512-+T7dOElhJivE7+V0JUeDK5TdHUU8Sbuhvnp8VmtHimLaTruv5FJS1dgSjAqGlRcMw9AX459JY9JCbkX9ezGh2g==
   dependencies:
     eventemitter3 "^4.0.4"
 
@@ -1213,9 +1251,9 @@
     undate "^0.3.0"
 
 "@textcomplete/utils@^0.1.10":
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/@textcomplete/utils/-/utils-0.1.10.tgz#c3ef1bae74effdbf9ff30cb7afd458068a839fc9"
-  integrity sha512-yI0TozB0bUqODA58JVyEOgLK5Rn9IJUYkQXAdvaVXDH6rOQUsoG292rkm4ULv+Kj4zIVDMvZrULAAuvEc55jDg==
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@textcomplete/utils/-/utils-0.1.11.tgz#9d3eae95016ae5f0a3e139b9729740ffd00fe11b"
+  integrity sha512-YBHPopILJWF7sD/MUa79u7VqRuVif1hFhpOe64CLSgVmI1w0uQ2OQroqQXJWJkWuYaCemScGqYWuGD4IM4U/AQ==
 
 "@tokenizer/token@^0.3.0":
   version "0.3.0"
@@ -1232,6 +1270,39 @@
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
+"@tsconfig/node10@^1.0.7":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
+  integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==
+
+"@tsconfig/node12@^1.0.7":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c"
+  integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==
+
+"@tsconfig/node14@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2"
+  integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==
+
+"@tsconfig/node16@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
+  integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
+
+"@types/bcryptjs@2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@types/bcryptjs/-/bcryptjs-2.4.2.tgz#e3530eac9dd136bfdfb0e43df2c4c5ce1f77dfae"
+  integrity sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==
+
+"@types/body-parser@*":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
 "@types/cacheable-request@^6.0.1":
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9"
@@ -1242,7 +1313,12 @@
     "@types/node" "*"
     "@types/responselike" "*"
 
-"@types/cheerio@^0.22.10":
+"@types/chai@*", "@types/chai@4.3.1":
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.1.tgz#e2c6e73e0bdeb2521d00756d099218e9f5d90a04"
+  integrity sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==
+
+"@types/cheerio@0.22.31":
   version "0.22.31"
   resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.31.tgz#b8538100653d6bb1b08a1e46dec75b4f2a5d5eb6"
   integrity sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==
@@ -1254,6 +1330,18 @@
   resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506"
   integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==
 
+"@types/connect@*":
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/content-disposition@0.5.4":
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/@types/content-disposition/-/content-disposition-0.5.4.tgz#de48cf01c79c9f1560bcfd8ae43217ab028657f8"
+  integrity sha512-0mPF08jn9zYI0n0Q/Pnz7C4kThdSt+6LD4amsrYDDpgBfrVWa3TcCOxKX1zkGgYniGagRv8heN2cbh+CAn+uuQ==
+
 "@types/cookie@^0.4.1":
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
@@ -1264,7 +1352,7 @@
   resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
   integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
 
-"@types/eslint-scope@^3.7.0":
+"@types/eslint-scope@^3.7.0", "@types/eslint-scope@^3.7.3":
   version "3.7.3"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
   integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
@@ -1273,14 +1361,14 @@
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304"
-  integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.2.tgz#48f2ac58ab9c631cb68845c3d956b28f79fad575"
+  integrity sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*":
+"@types/estree@*", "@types/estree@^0.0.51":
   version "0.0.51"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
@@ -1290,11 +1378,37 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
   integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
 
+"@types/express-serve-static-core@^4.17.18":
+  version "4.17.28"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
+  integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+
+"@types/express@4.17.13":
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
+  integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.18"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
 "@types/http-cache-semantics@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
   integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
 
+"@types/is-utf8@0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@types/is-utf8/-/is-utf8-0.2.0.tgz#819a0cbfc17047f036991e9d07a0aee548680ad0"
+  integrity sha512-qItpikdfKSDBiC6t15PIVgR3jnakgkpbPeOR5+Vn/xh+8+VAjkQC9//mfItTx0eRniIFZWt02h1XybSfzCO/QQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/json-buffer@~3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/json-buffer/-/json-buffer-3.0.0.tgz#85c1ff0f0948fc159810d4b5be35bf8c20875f64"
@@ -1312,6 +1426,33 @@
   dependencies:
     "@types/node" "*"
 
+"@types/ldapjs@2.2.2":
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-2.2.2.tgz#cf79510d8dc34e5579442c2743f8a228427eb99c"
+  integrity sha512-U5HdnwIZ5uZa+f3usxdqgyfNmOROxOxXvQdQtsu6sKo8fte5vej9br2csHxPvXreAbAO1bs8/rdEzvCLpi67nQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/linkify-it@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
+  integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
+
+"@types/lodash@4.14.182":
+  version "4.14.182"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
+  integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
+
+"@types/mime-types@2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.1.tgz#d9ba43490fa3a3df958759adf69396c3532cf2c1"
+  integrity sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==
+
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+
 "@types/minimatch@^3.0.3":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
@@ -1322,10 +1463,30 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
+"@types/mocha@9.1.1":
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
+  integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
+
+"@types/mousetrap@1.6.9":
+  version "1.6.9"
+  resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.9.tgz#f1ef9adbd1eac3466f21b6988b1c82c633a45340"
+  integrity sha512-HUAiN65VsRXyFCTicolwb5+I7FM6f72zjMWr+ajGk+YTvzBgXqa2A5U7d+rtsouAkunJ5U4Sb5lNJjo9w+nmXg==
+
 "@types/node@*", "@types/node@>=10.0.0":
-  version "17.0.23"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
-  integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==
+  version "17.0.41"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.41.tgz#1607b2fd3da014ae5d4d1b31bc792a39348dfb9b"
+  integrity sha512-xA6drNNeqb5YyV5fO3OAEsnXLfO7uF0whiOfPTz5AeDo8KeZFmODKnvwPymMNO8qE/an8pVY/O50tig2SQCrGw==
+
+"@types/node@17.0.31":
+  version "17.0.31"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.31.tgz#a5bb84ecfa27eec5e1c802c6bbf8139bdb163a5d"
+  integrity sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q==
+
+"@types/node@^14.6.1":
+  version "14.18.21"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.21.tgz#0155ee46f6be28b2ff0342ca1a9b9fd4468bef41"
+  integrity sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
@@ -1337,6 +1498,21 @@
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
+"@types/qs@*":
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+
+"@types/range-parser@*":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+
+"@types/read@0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/read/-/read-0.0.29.tgz#812468fb2dd009f37132045ab4788d89dd89cf43"
+  integrity sha512-TisW3O3OhpP8/ZwaiqV7kewh9gnoH7PfqHd4hkCM9ogiqWEagu43WXpHWqgPbltXhembYJDpYB3cVwUIOweHXg==
+
 "@types/responselike@*", "@types/responselike@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
@@ -1344,43 +1520,367 @@
   dependencies:
     "@types/node" "*"
 
+"@types/semver@7.3.9":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc"
+  integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==
+
+"@types/serve-static@*":
+  version "1.13.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
+  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
+"@types/sinon-chai@^3.2.4":
+  version "3.2.8"
+  resolved "https://registry.yarnpkg.com/@types/sinon-chai/-/sinon-chai-3.2.8.tgz#5871d09ab50d671d8e6dd72e9073f8e738ac61dc"
+  integrity sha512-d4ImIQbT/rKMG8+AXpmcan5T2/PNeSjrYhvkwet6z0p8kzYtfgA32xzOBlbU0yqJfq+/0Ml805iFoODO0LP5/g==
+  dependencies:
+    "@types/chai" "*"
+    "@types/sinon" "*"
+
+"@types/sinon@*":
+  version "10.0.11"
+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-10.0.11.tgz#8245827b05d3fc57a6601bd35aee1f7ad330fc42"
+  integrity sha512-dmZsHlBsKUtBpHriNjlK0ndlvEh8dcb9uV9Afsbt89QIyydpC7NcR+nWlAhASfy3GHnxTl4FX/aKE7XZUt/B4g==
+  dependencies:
+    "@types/sinonjs__fake-timers" "*"
+
+"@types/sinon@^9.0.5":
+  version "9.0.11"
+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.11.tgz#7af202dda5253a847b511c929d8b6dda170562eb"
+  integrity sha512-PwP4UY33SeeVKodNE37ZlOsR9cReypbMJOhZ7BVE0lB+Hix3efCOxiJWiE5Ia+yL9Cn2Ch72EjFTRze8RZsNtg==
+  dependencies:
+    "@types/sinonjs__fake-timers" "*"
+
+"@types/sinonjs__fake-timers@*":
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz#bf2e02a3dbd4aecaf95942ecd99b7402e03fad5e"
+  integrity sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==
+
+"@types/sortablejs@1.13.0":
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/@types/sortablejs/-/sortablejs-1.13.0.tgz#870223438f8f2cd81157b128a4c0261adbcaa946"
+  integrity sha512-C3064MH72iEfeGCYEGCt7FCxXoAXaMPG0QPnstcxvPmbl54erpISu06d++FY37Smja64iWy5L8wOyHHBghWbJQ==
+
+"@types/sqlite3@3.1.8":
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/@types/sqlite3/-/sqlite3-3.1.8.tgz#e64310c5841fc01c1a8795d960d951e4cf940296"
+  integrity sha512-sQMt/qnyUWnqiTcJXm5ZfNPIBeJ/DVvJDwxw+0tAxPJvadzfiP1QhryO1JOR6t1yfb8NpzQb/Rud06mob5laIA==
+  dependencies:
+    "@types/node" "*"
+
+"@types/ua-parser-js@0.7.36":
+  version "0.7.36"
+  resolved "https://registry.yarnpkg.com/@types/ua-parser-js/-/ua-parser-js-0.7.36.tgz#9bd0b47f26b5a3151be21ba4ce9f5fa457c5f190"
+  integrity sha512-N1rW+njavs70y2cApeIw1vLMYXRwfBy+7trgavGuuTfOd7j1Yh7QTRc/yqsPl6ncokt72ZXuxEU0PiCp9bSwNQ==
+
+"@types/uuid@8.3.4":
+  version "8.3.4"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
+  integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
+
+"@types/web-push@3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@types/web-push/-/web-push-3.3.2.tgz#8c32434147c0396415862e86405c9edc9c50fc15"
+  integrity sha512-JxWGVL/m7mWTIg4mRYO+A6s0jPmBkr4iJr39DqJpRJAc+jrPiEe1/asmkwerzRon8ZZDxaZJpsxpv0Z18Wo9gw==
+  dependencies:
+    "@types/node" "*"
+
+"@types/webpack-env@1.16.4":
+  version "1.16.4"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.4.tgz#1f4969042bf76d7ef7b5914f59b3b60073f4e1f4"
+  integrity sha512-llS8qveOUX3wxHnSykP5hlYFFuMfJ9p5JvIyCiBgp7WTfl6K5ZcyHj8r8JsN/J6QODkAsRRCLIcTuOCu8etkUw==
+
+"@types/webpack-hot-middleware@2.25.6":
+  version "2.25.6"
+  resolved "https://registry.yarnpkg.com/@types/webpack-hot-middleware/-/webpack-hot-middleware-2.25.6.tgz#4336abd668dc73284a777907cfd00147e794354a"
+  integrity sha512-1Q9ClNvZR30HIsEAHYQL3bXJK1K7IsrqjGMTfIureFjphsGOZ3TkbeoCupbCmi26pSLjVTPHp+pFrJNpOkBSVg==
+  dependencies:
+    "@types/connect" "*"
+    tapable "^2.2.0"
+    webpack "^5"
+
+"@types/ws@8.5.3":
+  version "8.5.3"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d"
+  integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==
+  dependencies:
+    "@types/node" "*"
+
+"@typescript-eslint/eslint-plugin@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.22.0.tgz#7b52a0de2e664044f28b36419210aea4ab619e2a"
+  integrity sha512-YCiy5PUzpAeOPGQ7VSGDEY2NeYUV1B0swde2e0HzokRsHBYjSdF6DZ51OuRZxVPHx0032lXGLvOMls91D8FXlg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.22.0"
+    "@typescript-eslint/type-utils" "5.22.0"
+    "@typescript-eslint/utils" "5.22.0"
+    debug "^4.3.2"
+    functional-red-black-tree "^1.0.1"
+    ignore "^5.1.8"
+    regexpp "^3.2.0"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/parser@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.22.0.tgz#7bedf8784ef0d5d60567c5ba4ce162460e70c178"
+  integrity sha512-piwC4krUpRDqPaPbFaycN70KCP87+PC5WZmrWs+DlVOxxmF+zI6b6hETv7Quy4s9wbkV16ikMeZgXsvzwI3icQ==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.22.0"
+    "@typescript-eslint/types" "5.22.0"
+    "@typescript-eslint/typescript-estree" "5.22.0"
+    debug "^4.3.2"
+
+"@typescript-eslint/scope-manager@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.22.0.tgz#590865f244ebe6e46dc3e9cab7976fc2afa8af24"
+  integrity sha512-yA9G5NJgV5esANJCO0oF15MkBO20mIskbZ8ijfmlKIvQKg0ynVKfHZ15/nhAJN5m8Jn3X5qkwriQCiUntC9AbA==
+  dependencies:
+    "@typescript-eslint/types" "5.22.0"
+    "@typescript-eslint/visitor-keys" "5.22.0"
+
+"@typescript-eslint/type-utils@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.22.0.tgz#0c0e93b34210e334fbe1bcb7250c470f4a537c19"
+  integrity sha512-iqfLZIsZhK2OEJ4cQ01xOq3NaCuG5FQRKyHicA3xhZxMgaxQazLUHbH/B2k9y5i7l3+o+B5ND9Mf1AWETeMISA==
+  dependencies:
+    "@typescript-eslint/utils" "5.22.0"
+    debug "^4.3.2"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/types@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.22.0.tgz#50a4266e457a5d4c4b87ac31903b28b06b2c3ed0"
+  integrity sha512-T7owcXW4l0v7NTijmjGWwWf/1JqdlWiBzPqzAWhobxft0SiEvMJB56QXmeCQjrPuM8zEfGUKyPQr/L8+cFUBLw==
+
+"@typescript-eslint/typescript-estree@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.22.0.tgz#e2116fd644c3e2fda7f4395158cddd38c0c6df97"
+  integrity sha512-EyBEQxvNjg80yinGE2xdhpDYm41so/1kOItl0qrjIiJ1kX/L/L8WWGmJg8ni6eG3DwqmOzDqOhe6763bF92nOw==
+  dependencies:
+    "@typescript-eslint/types" "5.22.0"
+    "@typescript-eslint/visitor-keys" "5.22.0"
+    debug "^4.3.2"
+    globby "^11.0.4"
+    is-glob "^4.0.3"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.22.0.tgz#1f2c4897e2cf7e44443c848a13c60407861babd8"
+  integrity sha512-HodsGb037iobrWSUMS7QH6Hl1kppikjA1ELiJlNSTYf/UdMEwzgj0WIp+lBNb6WZ3zTwb0tEz51j0Wee3iJ3wQ==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    "@typescript-eslint/scope-manager" "5.22.0"
+    "@typescript-eslint/types" "5.22.0"
+    "@typescript-eslint/typescript-estree" "5.22.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+
+"@typescript-eslint/visitor-keys@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.22.0.tgz#f49c0ce406944ffa331a1cfabeed451ea4d0909c"
+  integrity sha512-DbgTqn2Dv5RFWluG88tn0pP6Ex0ROF+dpDO1TNNZdRtLjUr6bdznjA6f/qNqJLjd2PgguAES2Zgxh/JzwzETDg==
+  dependencies:
+    "@typescript-eslint/types" "5.22.0"
+    eslint-visitor-keys "^3.0.0"
+
 "@ungap/promise-all-settled@1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
   integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
 
-"@vue/component-compiler-utils@^3.1.0":
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz#f9f5fb53464b0c37b2c8d2f3fbfe44df60f61dc9"
-  integrity sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==
+"@vue/compiler-core@3.2.35":
+  version "3.2.35"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.35.tgz#f2fc01bd25d859a77b0d9ef5df28f657c1979070"
+  integrity sha512-1Mtmh8ceVUoUsn/PME5oM+Dus648rCeV/fBaZ4ERLFbTHBJXj6QmDPrSn9mfEyPDXE0RYIwyJNn884NdWK+Yiw==
   dependencies:
-    consolidate "^0.15.1"
-    hash-sum "^1.0.2"
-    lru-cache "^4.1.2"
-    merge-source-map "^1.1.0"
-    postcss "^7.0.36"
-    postcss-selector-parser "^6.0.2"
-    source-map "~0.6.1"
-    vue-template-es2015-compiler "^1.9.0"
-  optionalDependencies:
-    prettier "^1.18.2 || ^2.0.0"
+    "@babel/parser" "^7.16.4"
+    "@vue/shared" "3.2.35"
+    estree-walker "^2.0.2"
+    source-map "^0.6.1"
 
-"@vue/server-test-utils@1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@vue/server-test-utils/-/server-test-utils-1.3.0.tgz#56c8f41cbb4ed9af38a5668cc23f861fcbbcd44b"
-  integrity sha512-PxJoFoyXDa1zRiHjL4I2Dj1uknq4OS8l88LcwrN4ajMcTekGeMJSukNXzjlKXhPxnbjEJTz2R343tsMUfwKjOA==
+"@vue/compiler-core@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.37.tgz#b3c42e04c0e0f2c496ff1784e543fbefe91e215a"
+  integrity sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==
   dependencies:
-    "@types/cheerio" "^0.22.10"
-    cheerio "^1.0.0-rc.2"
+    "@babel/parser" "^7.16.4"
+    "@vue/shared" "3.2.37"
+    estree-walker "^2.0.2"
+    source-map "^0.6.1"
 
-"@vue/test-utils@1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.3.0.tgz#d563decdcd9c68a7bca151d4179a2bfd6d5c3e15"
-  integrity sha512-Xk2Xiyj2k5dFb8eYUKkcN9PzqZSppTlx7LaQWBbdA8tqh3jHr/KHX2/YLhNFc/xwDrgeLybqd+4ZCPJSGPIqeA==
+"@vue/compiler-dom@3.2.35":
+  version "3.2.35"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.35.tgz#11bbcca0d49f9991d64dd8fbf8a0a4453caa571c"
+  integrity sha512-I4bXB9MkRSTJ3gVXRQ4iaYJgABZGew+K/CCBoAh9fdLaeY7A7uUlS5nWGOlICSVfOH0/xk4QlcXeGZYCJkEleA==
   dependencies:
-    dom-event-types "^1.0.0"
-    lodash "^4.17.15"
-    pretty "^2.0.0"
+    "@vue/compiler-core" "3.2.35"
+    "@vue/shared" "3.2.35"
+
+"@vue/compiler-dom@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz#10d2427a789e7c707c872da9d678c82a0c6582b5"
+  integrity sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==
+  dependencies:
+    "@vue/compiler-core" "3.2.37"
+    "@vue/shared" "3.2.37"
+
+"@vue/compiler-sfc@3.2.35":
+  version "3.2.35"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.35.tgz#1de80f858b33548bc22d166126234435937ebe0c"
+  integrity sha512-2wKQtnuHfwBFc7uV2Cmtms3Cc7u/u6kKJI3F+i0A+9xnuahK39cCMNJKHzI9x93Xai+uft64fDc5JSh8zDQBQA==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/compiler-core" "3.2.35"
+    "@vue/compiler-dom" "3.2.35"
+    "@vue/compiler-ssr" "3.2.35"
+    "@vue/reactivity-transform" "3.2.35"
+    "@vue/shared" "3.2.35"
+    estree-walker "^2.0.2"
+    magic-string "^0.25.7"
+    postcss "^8.1.10"
+    source-map "^0.6.1"
+
+"@vue/compiler-sfc@^3.0.5":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz#3103af3da2f40286edcd85ea495dcb35bc7f5ff4"
+  integrity sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/compiler-core" "3.2.37"
+    "@vue/compiler-dom" "3.2.37"
+    "@vue/compiler-ssr" "3.2.37"
+    "@vue/reactivity-transform" "3.2.37"
+    "@vue/shared" "3.2.37"
+    estree-walker "^2.0.2"
+    magic-string "^0.25.7"
+    postcss "^8.1.10"
+    source-map "^0.6.1"
+
+"@vue/compiler-ssr@3.2.35":
+  version "3.2.35"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.35.tgz#8d7726f95444c02f3301083e2c6c814780fb7b00"
+  integrity sha512-dJyqB8fZbvVQEnWl5VGxkWHTqx0ERnZXXqInFzyOX8FpTEidmQbUSmDrXidea7bZTdeg6ly94kZFGPYXT29mgQ==
+  dependencies:
+    "@vue/compiler-dom" "3.2.35"
+    "@vue/shared" "3.2.35"
+
+"@vue/compiler-ssr@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz#4899d19f3a5fafd61524a9d1aee8eb0505313cff"
+  integrity sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==
+  dependencies:
+    "@vue/compiler-dom" "3.2.37"
+    "@vue/shared" "3.2.37"
+
+"@vue/devtools-api@^6.0.0", "@vue/devtools-api@^6.0.0-beta.11":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.1.4.tgz#b4aec2f4b4599e11ba774a50c67fa378c9824e53"
+  integrity sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ==
+
+"@vue/reactivity-transform@3.2.35":
+  version "3.2.35"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.35.tgz#29ba344b0ec9ec7ee75ca6c1a6f349595ca150d8"
+  integrity sha512-VjdQU4nIrgsh1iPqAdYZufWgFqdH9fIl6ttO2PCFlLsrQl7b8BcuawM6moSBLF8damBzSNcqvbvQDBhsI3fyVQ==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/compiler-core" "3.2.35"
+    "@vue/shared" "3.2.35"
+    estree-walker "^2.0.2"
+    magic-string "^0.25.7"
+
+"@vue/reactivity-transform@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz#0caa47c4344df4ae59f5a05dde2a8758829f8eca"
+  integrity sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/compiler-core" "3.2.37"
+    "@vue/shared" "3.2.37"
+    estree-walker "^2.0.2"
+    magic-string "^0.25.7"
+
+"@vue/reactivity@3.2.33":
+  version "3.2.33"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.33.tgz#c84eedb5225138dbfc2472864c151d3efbb4b673"
+  integrity sha512-62Sq0mp9/0bLmDuxuLD5CIaMG2susFAGARLuZ/5jkU1FCf9EDbwUuF+BO8Ub3Rbodx0ziIecM/NsmyjardBxfQ==
+  dependencies:
+    "@vue/shared" "3.2.33"
+
+"@vue/reactivity@3.2.35":
+  version "3.2.35"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.35.tgz#c66af289f3beda6aba63c264db9c6acd607d1c73"
+  integrity sha512-6j9N9R1SwHVcJas4YqAzwdRS/cgmj3Z9aUert5Mv1jk5B9H9ivN/zot/fgMUbseWXigkkmX60OsfRbz49o8kCw==
+  dependencies:
+    "@vue/shared" "3.2.35"
+
+"@vue/runtime-core@3.2.33":
+  version "3.2.33"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.33.tgz#2df8907c85c37c3419fbd1bdf1a2df097fa40df2"
+  integrity sha512-N2D2vfaXsBPhzCV3JsXQa2NECjxP3eXgZlFqKh4tgakp3iX6LCGv76DLlc+IfFZq+TW10Y8QUfeihXOupJ1dGw==
+  dependencies:
+    "@vue/reactivity" "3.2.33"
+    "@vue/shared" "3.2.33"
+
+"@vue/runtime-core@3.2.35":
+  version "3.2.35"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.35.tgz#a87bd5214ff31f9dc6542f5c498d4f3543c6ea8f"
+  integrity sha512-P8AeGPRGyIiYdOdvLc/7KR8VSdbUGG8Jxdx6Xlj5okEjyV9IYxeHRIQIoye85K0lZXBH4zuh1syD1mX+oZ0KqQ==
+  dependencies:
+    "@vue/reactivity" "3.2.35"
+    "@vue/shared" "3.2.35"
+
+"@vue/runtime-dom@3.2.33":
+  version "3.2.33"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.33.tgz#123b8969247029ea0d9c1983676d4706a962d848"
+  integrity sha512-LSrJ6W7CZTSUygX5s8aFkraDWlO6K4geOwA3quFF2O+hC3QuAMZt/0Xb7JKE3C4JD4pFwCSO7oCrZmZ0BIJUnw==
+  dependencies:
+    "@vue/runtime-core" "3.2.33"
+    "@vue/shared" "3.2.33"
+    csstype "^2.6.8"
+
+"@vue/runtime-dom@3.2.35":
+  version "3.2.35"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.35.tgz#004bf6109353e75cf22eb11baf247288c216ef7b"
+  integrity sha512-M5xrVJ/b0KqssjPQMdpwLp3KwzG1Tn2w/IrOptVqGY5c9fEBluIbm18AeO4Fr3YxfeyaPWm1rY8POrEso0UE3w==
+  dependencies:
+    "@vue/runtime-core" "3.2.35"
+    "@vue/shared" "3.2.35"
+    csstype "^2.6.8"
+
+"@vue/server-renderer@3.2.35":
+  version "3.2.35"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.35.tgz#79fb9e2315ec6196b5f2f385ef4ae31cf5599a2f"
+  integrity sha512-ZMF8V+bZ0EIjSB7yzPEmDlxRDOIXj04iqG4Rw/H5rIuBCf0b7rNTleiOldlX5haG++zUq6uiL2AVp/A9uyz+cw==
+  dependencies:
+    "@vue/compiler-ssr" "3.2.35"
+    "@vue/shared" "3.2.35"
+
+"@vue/shared@3.2.33":
+  version "3.2.33"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.33.tgz#69a8c99ceb37c1b031d5cc4aec2ff1dc77e1161e"
+  integrity sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==
+
+"@vue/shared@3.2.35":
+  version "3.2.35"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.35.tgz#fb60530fa009dc21473386a7639eed833877cb0f"
+  integrity sha512-/sxDqMcy0MsfQ3LQixKYDxIinDYNy1dXTsF2Am0pv0toImWabymFQ8cFmPJnPt+gh5ElKwwn7KzQcDbLHar60A==
+
+"@vue/shared@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.37.tgz#8e6adc3f2759af52f0e85863dfb0b711ecc5c702"
+  integrity sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==
+
+"@vue/test-utils@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.0.0.tgz#06455934091d237d71d81bac6617485de38b1c58"
+  integrity sha512-zL5kygNq7hONrO1CzaUGprEAklAX+pH8J1MPMCU3Rd2xtSYkZ+PmKU3oEDRg8VAGdL5lNJHzDgrud5amFPtirw==
 
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
@@ -1553,15 +2053,20 @@ acorn-import-assertions@^1.7.6:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
   integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
 
-acorn-jsx@^5.3.1:
+acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+acorn-walk@^8.1.1:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+
+acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1:
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
@@ -1636,21 +2141,11 @@ ansi-html-community@0.0.8:
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -1688,7 +2183,7 @@ append-transform@^2.0.0:
 archy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
+  integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
 
 are-we-there-yet@^2.0.0:
   version "2.0.0"
@@ -1706,6 +2201,11 @@ are-we-there-yet@^3.0.0:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1726,7 +2226,7 @@ array-differ@^3.0.0:
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
 array-union@^2.1.0:
   version "2.1.0"
@@ -1741,7 +2241,7 @@ array-union@^3.0.1:
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
 arrify@^2.0.1:
   version "2.0.1"
@@ -1768,7 +2268,7 @@ asn1@^0.2.4:
 assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
 
 assertion-error@^1.1.0:
   version "1.1.0"
@@ -1781,12 +2281,12 @@ astral-regex@^2.0.0:
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
 autoprefixer@^10.4.2:
-  version "10.4.4"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.4.tgz#3e85a245b32da876a893d3ac2ea19f01e7ea5a1e"
-  integrity sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA==
+  version "10.4.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.7.tgz#1db8d195f41a52ca5069b7593be167618edbbedf"
+  integrity sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==
   dependencies:
-    browserslist "^4.20.2"
-    caniuse-lite "^1.0.30001317"
+    browserslist "^4.20.3"
+    caniuse-lite "^1.0.30001335"
     fraction.js "^4.2.0"
     normalize-range "^0.1.2"
     picocolors "^1.0.0"
@@ -1849,15 +2349,25 @@ babel-plugin-polyfill-regenerator@^0.3.0:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.3.1"
 
+babel-preset-typescript-vue3@2.0.17:
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/babel-preset-typescript-vue3/-/babel-preset-typescript-vue3-2.0.17.tgz#632111a4e91535f238ecaa1c08dbee4e1b3c10ad"
+  integrity sha512-6AdNf72Jd9OTap9ws12bAehn/GuuBSqUPN+nuOY7XCMckRcvPbO1G+yFvF+ahQsiMCk+gUZwTie1eoQMzeesog==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-transform-typescript" "^7.3.2"
+    "@babel/preset-typescript" "^7.3.3"
+    "@vue/compiler-sfc" "^3.0.5"
+
 backo2@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+  integrity sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==
 
 backoff@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/backoff/-/backoff-2.5.0.tgz#f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"
-  integrity sha1-9hbtqdPktmuMp/ynn2lXIsX44m8=
+  integrity sha512-wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA==
   dependencies:
     precond "0.2"
 
@@ -1884,7 +2394,7 @@ base64id@2.0.0, base64id@~2.0.0:
 bcryptjs@2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
-  integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms=
+  integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==
 
 big.js@^5.2.2:
   version "5.2.2"
@@ -1896,11 +2406,6 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bluebird@^3.1.1:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
 bn.js@^4.0.0:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
@@ -1925,7 +2430,7 @@ body-parser@1.19.2:
 boolbase@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -1947,32 +2452,21 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.19.1, browserslist@^4.20.2:
-  version "4.20.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
-  integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
+browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.19.1, browserslist@^4.20.2, browserslist@^4.20.3:
+  version "4.20.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.4.tgz#98096c9042af689ee1e0271333dbc564b8ce4477"
+  integrity sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==
   dependencies:
-    caniuse-lite "^1.0.30001317"
-    electron-to-chromium "^1.4.84"
+    caniuse-lite "^1.0.30001349"
+    electron-to-chromium "^1.4.147"
     escalade "^3.1.1"
-    node-releases "^2.0.2"
-    picocolors "^1.0.0"
-
-browserslist@^4.20.3:
-  version "4.20.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf"
-  integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==
-  dependencies:
-    caniuse-lite "^1.0.30001332"
-    electron-to-chromium "^1.4.118"
-    escalade "^3.1.1"
-    node-releases "^2.0.3"
+    node-releases "^2.0.5"
     picocolors "^1.0.0"
 
 buffer-equal-constant-time@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
-  integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
+  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
 
 buffer-from@^1.0.0:
   version "1.1.2"
@@ -2086,15 +2580,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317:
-  version "1.0.30001331"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001331.tgz#41048f2a5cf0c3c6198f40207cd323388b3d4399"
-  integrity sha512-Y1xk6paHpUXKP/P6YjQv1xqyTbgAP05ycHBcRdQjTcyXlWol868sJJPlmk5ylOekw2BrucWes5jk+LvVd7WZ5Q==
-
-caniuse-lite@^1.0.30001332:
-  version "1.0.30001334"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001334.tgz#892e9965b35285033fc2b8a8eff499fe02f13d8b"
-  integrity sha512-kbaCEBRRVSoeNs74sCuq92MJyGrMtjWVfhltoHUCW4t4pXFvGjUBrfo47weBRViHkiV3eBYyIsfl956NtHGazw==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001335, caniuse-lite@^1.0.30001349:
+  version "1.0.30001349"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001349.tgz#90740086a2eb2e825084944169d313c9793aeba4"
+  integrity sha512-VFaWW3jeo6DLU5rwdiasosxhYSduJgSGil4cSyX3/85fbctlE58pXAkWyuRmVA0r2RxsOSVYUTZcySJ8WpbTxw==
 
 chai@4.3.6:
   version "4.3.6"
@@ -2117,17 +2606,6 @@ chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
 chalk@^2.0.0, chalk@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -2148,7 +2626,7 @@ chalk@^3.0.0:
 check-error@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-  integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
+  integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
 
 cheerio-select@^1.5.0:
   version "1.6.0"
@@ -2161,7 +2639,7 @@ cheerio-select@^1.5.0:
     domhandler "^4.3.1"
     domutils "^2.8.0"
 
-cheerio@1.0.0-rc.10, cheerio@^1.0.0-rc.2:
+cheerio@1.0.0-rc.10:
   version "1.0.0-rc.10"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e"
   integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==
@@ -2246,7 +2724,7 @@ clone-regexp@^2.1.0:
 clone-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  integrity sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==
   dependencies:
     mimic-response "^1.0.0"
 
@@ -2267,7 +2745,7 @@ color-convert@^2.0.1:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
@@ -2285,16 +2763,16 @@ colord@^2.9.1, colord@^2.9.2:
   integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==
 
 colorette@^2.0.10, colorette@^2.0.14:
-  version "2.0.16"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
-  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.17.tgz#5dd4c0d15e2984b7433cb4a9f2ead45063b80c47"
+  integrity sha512-hJo+3Bkn0NCHybn9Tu35fIeoOKGOk5OCC32y4Hz2It+qlCO2Q3DeQ1hRn/tDDMQKRYUEzqsl7jbF6dYKjlE60g==
 
 commander@9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-9.0.0.tgz#86d58f24ee98126568936bd1d3574e0308a99a40"
   integrity sha512-JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw==
 
-commander@^2.19.0, commander@^2.20.0:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2307,7 +2785,7 @@ commander@^7.0.0, commander@^7.2.0:
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
 compare-versions@^3.6.0:
   version "3.6.0"
@@ -2319,10 +2797,10 @@ component-emitter@~1.3.0:
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-compress-brotli@^1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/compress-brotli/-/compress-brotli-1.3.6.tgz#64bd6f21f4f3e9841dbac392f4c29218caf5e9d9"
-  integrity sha512-au99/GqZtUtiCBliqLFbWlhnCxn+XSYjwZ77q6mKN4La4qOXDoLVPZ50iXr0WmAyMxl8yqoq3Yq4OeQNPPkyeQ==
+compress-brotli@^1.3.8:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/compress-brotli/-/compress-brotli-1.3.8.tgz#0c0a60c97a989145314ec381e84e26682e7b38db"
+  integrity sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==
   dependencies:
     "@types/json-buffer" "~3.0.0"
     json-buffer "~3.0.1"
@@ -2330,36 +2808,12 @@ compress-brotli@^1.3.6:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-condense-newlines@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f"
-  integrity sha1-PemFVTE5R10yUCyDsC9gaE0kxV8=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-whitespace "^0.3.0"
-    kind-of "^3.0.2"
-
-config-chain@^1.1.13:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
-  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 console-control-strings@^1.0.0, console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
-consolidate@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
-  integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
-  dependencies:
-    bluebird "^3.1.1"
+  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
 content-disposition@0.5.4:
   version "0.5.4"
@@ -2383,7 +2837,7 @@ convert-source-map@^1.7.0:
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
 cookie@0.4.2, cookie@~0.4.1:
   version "0.4.2"
@@ -2402,31 +2856,23 @@ copy-webpack-plugin@10.2.4:
     schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
 
-core-js-compat@^3.21.0:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82"
-  integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==
-  dependencies:
-    browserslist "^4.19.1"
-    semver "7.0.0"
-
-core-js-compat@^3.22.1:
-  version "3.22.3"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.3.tgz#9b10d786052d042bc97ee8df9c0d1fb6a49c2005"
-  integrity sha512-wliMbvPI2idgFWpFe7UEyHMvu6HWgW8WA+HnDRtgzoSDYvXFMpoGX1H3tPDDXrcfUSyXafCLDd7hOeMQHEZxGw==
+core-js-compat@^3.21.0, core-js-compat@^3.22.1:
+  version "3.22.8"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.8.tgz#46fa34ce1ddf742acd7f95f575f66bbb21e05d62"
+  integrity sha512-pQnwg4xtuvc2Bs/5zYQPaEYYSuTxsF7LBWF0SvnVhthZo/Qe+rJpcEekrdNK5DWwDJ0gv0oI9NNX5Mppdy0ctg==
   dependencies:
     browserslist "^4.20.3"
     semver "7.0.0"
 
 core-js@^3.19.1:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94"
-  integrity sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==
+  version "3.22.8"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.8.tgz#23f860b1fe60797cc4f704d76c93fea8a2f60631"
+  integrity sha512-UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA==
 
 core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
 
 cors@~2.8.5:
   version "2.8.5"
@@ -2447,6 +2893,18 @@ cosmiconfig@^7.0.0, cosmiconfig@^7.0.1:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
+create-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
+cross-env@7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
+  dependencies:
+    cross-spawn "^7.0.1"
+
 cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -2458,7 +2916,7 @@ cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -2530,9 +2988,9 @@ css-what@^6.0.1:
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
 cssdb@^6.1.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-6.5.0.tgz#61264b71f29c834f09b59cb3e5b43c8226590122"
-  integrity sha512-Rh7AAopF2ckPXe/VBcoUS9JrCZNSyc60+KpgE6X25vpVxA32TmiqvExjkfhwP4wGSb6Xe8Z/JIyGqwgx/zZYFA==
+  version "6.6.3"
+  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-6.6.3.tgz#1f331a2fab30c18d9f087301e6122a878bb1e505"
+  integrity sha512-7GDvDSmE+20+WcSMhP17Q1EVWUrLlbxxpMDqG731n8P99JhnQZHR9YvtjPvEHfjFUjvQJvdpKCjlKOX+xe4UVA==
 
 cssesc@^3.0.0:
   version "3.0.0"
@@ -2540,25 +2998,25 @@ cssesc@^3.0.0:
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
 cssnano-preset-default@^5.1.12:
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz#791e3603fb8f1b46717ac53b47e3c418e950f5f3"
-  integrity sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA==
+  version "5.2.11"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.11.tgz#28350471bc1af9df14052472b61340347f453a53"
+  integrity sha512-4PadR1NtuaIK8MvLNuY7MznK4WJteldGlzCiMaaTiOUP+apeiIvUDIXykzUOoqgOOUAHrU64ncdD90NfZR3LSQ==
   dependencies:
     css-declaration-sorter "^6.2.2"
     cssnano-utils "^3.1.0"
     postcss-calc "^8.2.3"
     postcss-colormin "^5.3.0"
-    postcss-convert-values "^5.1.0"
-    postcss-discard-comments "^5.1.1"
+    postcss-convert-values "^5.1.2"
+    postcss-discard-comments "^5.1.2"
     postcss-discard-duplicates "^5.1.0"
     postcss-discard-empty "^5.1.1"
     postcss-discard-overridden "^5.1.0"
-    postcss-merge-longhand "^5.1.4"
-    postcss-merge-rules "^5.1.1"
+    postcss-merge-longhand "^5.1.5"
+    postcss-merge-rules "^5.1.2"
     postcss-minify-font-values "^5.1.0"
     postcss-minify-gradients "^5.1.1"
-    postcss-minify-params "^5.1.2"
-    postcss-minify-selectors "^5.2.0"
+    postcss-minify-params "^5.1.3"
+    postcss-minify-selectors "^5.2.1"
     postcss-normalize-charset "^5.1.0"
     postcss-normalize-display-values "^5.1.0"
     postcss-normalize-positions "^5.1.0"
@@ -2568,7 +3026,7 @@ cssnano-preset-default@^5.1.12:
     postcss-normalize-unicode "^5.1.0"
     postcss-normalize-url "^5.1.0"
     postcss-normalize-whitespace "^5.1.1"
-    postcss-ordered-values "^5.1.1"
+    postcss-ordered-values "^5.1.2"
     postcss-reduce-initial "^5.1.0"
     postcss-reduce-transforms "^5.1.0"
     postcss-svgo "^5.1.0"
@@ -2595,16 +3053,16 @@ csso@^4.2.0:
   dependencies:
     css-tree "^1.1.2"
 
+csstype@^2.6.8:
+  version "2.6.20"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.20.tgz#9229c65ea0b260cf4d3d997cb06288e36a8d6dda"
+  integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==
+
 dayjs@1.10.8:
   version "1.10.8"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.8.tgz#267df4bc6276fcb33c04a6735287e3f429abec41"
   integrity sha512-wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow==
 
-de-indent@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
-  integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=
-
 debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -2612,7 +3070,7 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -2629,7 +3087,7 @@ debug@4.3.3:
 decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
-  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
+  integrity sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
@@ -2637,7 +3095,7 @@ decamelize-keys@^1.1.0:
 decamelize@^1.1.0, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decamelize@^4.0.0:
   version "4.0.0"
@@ -2680,38 +3138,49 @@ defer-to-connect@^2.0.0:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
   integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
 
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+define-properties@^1.1.3, define-properties@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
   dependencies:
-    object-keys "^1.0.12"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
 
 depd@^1.1.2, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+  integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==
 
 detect-libc@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
   integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
 
-diff@5.0.0, diff@^5.0.0:
+diff@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
   integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
 
+diff@^4.0.1, diff@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
+diff@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
+  integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -2726,11 +3195,6 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-event-types@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/dom-event-types/-/dom-event-types-1.1.0.tgz#120c1f92ddea7758db1ccee0a100a33c39f4701b"
-  integrity sha512-jNCX+uNJ3v38BKvPbpki6j5ItVlnSqVV6vDWGS6rExzCMjsc39frLjm1n91o6YaKK6AZl0wLloItW6C6mr61BQ==
-
 dom-serializer@^1.0.1, dom-serializer@^1.3.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
@@ -2768,30 +3232,15 @@ ecdsa-sig-formatter@1.0.11:
   dependencies:
     safe-buffer "^5.0.1"
 
-editorconfig@^0.15.3:
-  version "0.15.3"
-  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
-  integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
-  dependencies:
-    commander "^2.19.0"
-    lru-cache "^4.1.5"
-    semver "^5.6.0"
-    sigmund "^1.0.1"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.4.118:
-  version "1.4.129"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.129.tgz#c675793885721beefff99da50f57c6525c2cd238"
-  integrity sha512-GgtN6bsDtHdtXJtlMYZWGB/uOyjZWjmRDumXTas7dGBaB9zUyCjzHet1DY2KhyHN8R0GLbzZWqm4efeddqqyRQ==
-
-electron-to-chromium@^1.4.84:
-  version "1.4.107"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.107.tgz#564257014ab14033b4403a309c813123c58a3fb9"
-  integrity sha512-Huen6taaVrUrSy8o7mGStByba8PfOWWluHNxSHGBrCgEdFVLtvdQDBr9LBCF9Uci8SYxh28QNNMO0oC17wbGAg==
+electron-to-chromium@^1.4.147:
+  version "1.4.148"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.148.tgz#437430e03c58ccd1d05701f66980afe54d2253ec"
+  integrity sha512-8MJk1bcQUAYkuvCyWZxaldiwoDG0E0AMzBGA6cv3WfuvJySiPgfidEPBFCRRH3cZm6SVZwo/oRlK1ehi1QNEIQ==
 
 emoji-regex@9.2.2:
   version "9.2.2"
@@ -2811,7 +3260,7 @@ emojis-list@^3.0.0:
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
 encoding@^0.1.12:
   version "0.1.13"
@@ -2843,11 +3292,9 @@ engine.io-client@~6.1.1:
     yeast "0.1.2"
 
 engine.io-parser@~5.0.0, engine.io-parser@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.3.tgz#ca1f0d7b11e290b4bfda251803baea765ed89c09"
-  integrity sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==
-  dependencies:
-    "@socket.io/base64-arraybuffer" "~1.0.2"
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0"
+  integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==
 
 engine.io@~6.1.0:
   version "6.1.3"
@@ -2865,7 +3312,7 @@ engine.io@~6.1.0:
     engine.io-parser "~5.0.3"
     ws "~8.2.3"
 
-enhanced-resolve@^5.8.3:
+enhanced-resolve@^5.0.0, enhanced-resolve@^5.8.3, enhanced-resolve@^5.9.3:
   version "5.9.3"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz#44a342c012cbc473254af5cc6ae20ebd0aae5d88"
   integrity sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==
@@ -2900,17 +3347,19 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.18.5, es-abstract@^1.19.1:
-  version "1.19.4"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.4.tgz#79a95527af382eb276075627e53762393ce8b57a"
-  integrity sha512-flV8e5g9/xulChMG48Fygk1ptpo4lQRJ0eJYtxJFgi7pklLx7EFcOJ34jnvr8pbWlaFN/AT1cZpe0hiFel9Hqg==
+es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.5, es-abstract@^1.20.0:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
+  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
+    function.prototype.name "^1.1.5"
     get-intrinsic "^1.1.1"
     get-symbol-description "^1.0.0"
     has "^1.0.3"
+    has-property-descriptors "^1.0.0"
     has-symbols "^1.0.3"
     internal-slot "^1.0.3"
     is-callable "^1.2.4"
@@ -2922,9 +3371,10 @@ es-abstract@^1.18.5, es-abstract@^1.19.1:
     object-inspect "^1.12.0"
     object-keys "^1.1.1"
     object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
+    regexp.prototype.flags "^1.4.3"
+    string.prototype.trimend "^1.0.5"
+    string.prototype.trimstart "^1.0.5"
+    unbox-primitive "^1.0.2"
 
 es-module-lexer@^0.9.0:
   version "0.9.3"
@@ -2953,7 +3403,7 @@ escalade@^3.1.1:
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
 escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
   version "4.0.0"
@@ -2963,24 +3413,32 @@ escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 eslint-config-prettier@8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
   integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
 
-eslint-plugin-vue@8.4.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-8.4.0.tgz#16e59b356386b4428fb7d886b6d8ee5df2bbc09d"
-  integrity sha512-Ga96QRG8GA9AyzKtEDxqYRCMt/VJM4SLkcNmm4FvUiFBE4jpaBr25unRBi9iVmHLYhA9EZ/4I+jD8n1vfWzyAA==
+eslint-define-config@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/eslint-define-config/-/eslint-define-config-1.5.1.tgz#ba9b18f59b73c8ea9eb3b7423bf891022f3312de"
+  integrity sha512-6gxrmN7aKGffaO8dCtMMKyo3IxbWymMQ248p4lf8GbaFRcLsqOXHFdUhhM0Hcy1NudvnpwHcfbDf7Nh9pIm1TA==
+
+eslint-plugin-vue@9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.0.1.tgz#66ba4a6e4085a26a724adcde06eaf72b178285c9"
+  integrity sha512-/w/9/vzz+4bSYtp5UqXgJ0CfycXTMtpp6lkz7/fMp0CcJxPWyRP6Pr88ihhrsNEcVt2ZweMupWRNYa+5Md41LQ==
   dependencies:
     eslint-utils "^3.0.0"
     natural-compare "^1.4.0"
+    nth-check "^2.0.1"
+    postcss-selector-parser "^6.0.9"
     semver "^7.3.5"
-    vue-eslint-parser "^8.0.1"
+    vue-eslint-parser "^9.0.1"
+    xml-name-validator "^4.0.0"
 
-eslint-scope@5.1.1:
+eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -2988,7 +3446,7 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.0.0, eslint-scope@^7.1.0:
+eslint-scope@^7.0.0, eslint-scope@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
   integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
@@ -3008,17 +3466,17 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.2.0, eslint-visitor-keys@^3.3.0:
+eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.8.0.tgz#9762b49abad0cb4952539ffdb0a046392e571a2d"
-  integrity sha512-H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ==
+eslint@8.16.0:
+  version "8.16.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.16.0.tgz#6d936e2d524599f2a86c708483b4c372c5d3bbae"
+  integrity sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==
   dependencies:
-    "@eslint/eslintrc" "^1.0.5"
+    "@eslint/eslintrc" "^1.3.0"
     "@humanwhocodes/config-array" "^0.9.2"
     ajv "^6.10.0"
     chalk "^4.0.0"
@@ -3026,17 +3484,17 @@ eslint@8.8.0:
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.0"
+    eslint-scope "^7.1.1"
     eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.2.0"
-    espree "^9.3.0"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.3.2"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     functional-red-black-tree "^1.0.1"
     glob-parent "^6.0.1"
-    globals "^13.6.0"
+    globals "^13.15.0"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
@@ -3045,7 +3503,7 @@ eslint@8.8.0:
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
     regexpp "^3.2.0"
@@ -3054,13 +3512,13 @@ eslint@8.8.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@^9.0.0, espree@^9.3.0, espree@^9.3.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd"
-  integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==
+espree@^9.0.0, espree@^9.3.1, espree@^9.3.2:
+  version "9.3.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596"
+  integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
   dependencies:
-    acorn "^8.7.0"
-    acorn-jsx "^5.3.1"
+    acorn "^8.7.1"
+    acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
 esprima@^4.0.0:
@@ -3092,6 +3550,11 @@ estraverse@^5.1.0, estraverse@^5.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
+estree-walker@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -3100,7 +3563,7 @@ esutils@^2.0.2:
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
 eventemitter3@^4.0.4, eventemitter3@^4.0.7:
   version "4.0.7"
@@ -3185,13 +3648,6 @@ express@4.17.3:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
 extsprintf@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
@@ -3221,7 +3677,7 @@ fast-json-stable-stringify@^2.0.0:
 fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fast-text-encoding@^1.0.0:
   version "1.0.3"
@@ -3259,7 +3715,7 @@ file-type@16.5.3:
 filename-reserved-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
-  integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik=
+  integrity sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==
 
 filenamify@4.3.0:
   version "4.3.0"
@@ -3340,10 +3796,12 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
   integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"
 
 foreground-child@^2.0.0:
   version "2.0.0"
@@ -3366,7 +3824,7 @@ fraction.js@^4.2.0:
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
 fromentries@^1.2.0:
   version "1.3.2"
@@ -3388,7 +3846,7 @@ fs-monkey@1.0.3:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@~2.3.2:
   version "2.3.2"
@@ -3400,15 +3858,30 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
+
+functions-have-names@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
 fuzzy@0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"
-  integrity sha1-THbsL/CsGjap3M+aAN+GIweNTtg=
+  integrity sha512-/gZffu4ykarLrCiP3Ygsa86UAo1E5vEVlvTrpkKywXSbP9Xhln3oSp9QSV57gEq3JFFpGJ4GZ+5zdEp3FcUh4w==
 
 gauge@^3.0.0:
   version "3.0.2"
@@ -3425,7 +3898,7 @@ gauge@^3.0.0:
     strip-ansi "^6.0.1"
     wide-align "^1.1.2"
 
-gauge@^4.0.0:
+gauge@^4.0.3:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
   integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
@@ -3452,7 +3925,7 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
 get-func-name@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
+  integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
 
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
   version "1.1.1"
@@ -3512,7 +3985,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@7.2.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -3524,6 +3997,18 @@ glob@7.2.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
@@ -3545,14 +4030,14 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.13.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b"
-  integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==
+globals@^13.15.0:
+  version "13.15.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac"
+  integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.1.0:
+globby@^11.0.4, globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -3579,9 +4064,9 @@ globby@^12.0.2:
 globjoin@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
-  integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=
+  integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==
 
-got@11.8.3, got@^11.8.2:
+got@11.8.3:
   version "11.8.3"
   resolved "https://registry.yarnpkg.com/got/-/got-11.8.3.tgz#f496c8fdda5d729a90b4905d2b07dbd148170770"
   integrity sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg==
@@ -3598,6 +4083,23 @@ got@11.8.3, got@^11.8.2:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
+got@^11.8.2:
+  version "11.8.5"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
+  integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==
+  dependencies:
+    "@sindresorhus/is" "^4.0.0"
+    "@szmarczak/http-timer" "^4.0.5"
+    "@types/cacheable-request" "^6.0.1"
+    "@types/responselike" "^1.0.0"
+    cacheable-lookup "^5.0.3"
+    cacheable-request "^7.0.2"
+    decompress-response "^6.0.0"
+    http2-wrapper "^1.0.0-beta.5.2"
+    lowercase-keys "^2.0.0"
+    p-cancelable "^2.0.0"
+    responselike "^2.0.0"
+
 graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
@@ -3618,33 +4120,33 @@ hard-rejection@^2.1.0:
   resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
   integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
 
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+has-bigints@^1.0.1, has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+  integrity sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
 has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
@@ -3660,7 +4162,7 @@ has-tostringtag@^1.0.0:
 has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
 has@^1.0.3:
   version "1.0.3"
@@ -3669,10 +4171,10 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hash-sum@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
-  integrity sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=
+hash-sum@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a"
+  integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==
 
 hasha@^5.0.0:
   version "5.2.2"
@@ -3682,7 +4184,7 @@ hasha@^5.0.0:
     is-stream "^2.0.0"
     type-fest "^0.8.0"
 
-he@1.2.0, he@^1.1.0:
+he@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -3765,9 +4267,9 @@ http_ece@1.1.0:
     urlsafe-base64 "~1.0.0"
 
 https-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
   dependencies:
     agent-base "6"
     debug "4"
@@ -3785,7 +4287,7 @@ human-signals@^2.1.0:
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
+  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
   dependencies:
     ms "^2.0.0"
 
@@ -3829,7 +4331,7 @@ ieee754@^1.2.1:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.1.4, ignore@^5.1.9, ignore@^5.2.0:
+ignore@^5.1.4, ignore@^5.1.8, ignore@^5.1.9, ignore@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
@@ -3858,7 +4360,7 @@ import-local@^3.0.2:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^4.0.0:
   version "4.0.0"
@@ -3873,7 +4375,7 @@ infer-owner@^1.0.4:
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -3883,7 +4385,7 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.4:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+ini@^1.3.5, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
@@ -3903,9 +4405,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48"
+  integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
 
 ipaddr.js@1.9.1:
   version "1.9.1"
@@ -3941,7 +4443,7 @@ is-arguments@^1.0.4:
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-bigint@^1.0.1:
   version "1.0.4"
@@ -3965,20 +4467,15 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-callable@^1.1.4, is-callable@^1.2.4:
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
 is-core-module@^2.5.0, is-core-module@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
-  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
+  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
   dependencies:
     has "^1.0.3"
 
@@ -3989,15 +4486,10 @@ is-date-object@^1.0.1:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-extendable@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
@@ -4021,7 +4513,7 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
 is-lambda@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
-  integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=
+  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
 
 is-negative-zero@^2.0.2:
   version "2.0.2"
@@ -4043,7 +4535,7 @@ is-number@^7.0.0:
 is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
 
 is-plain-obj@^2.1.0:
   version "2.1.0"
@@ -4101,21 +4593,21 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typed-array@^1.1.3, is-typed-array@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.8.tgz#cbaa6585dc7db43318bc5b89523ea384a6f65e79"
-  integrity sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==
+is-typed-array@^1.1.3, is-typed-array@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz#246d77d2871e7d9f5aeb1d54b9f52c71329ece67"
+  integrity sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==
   dependencies:
     available-typed-arrays "^1.0.5"
     call-bind "^1.0.2"
-    es-abstract "^1.18.5"
-    foreach "^2.0.5"
+    es-abstract "^1.20.0"
+    for-each "^0.3.3"
     has-tostringtag "^1.0.0"
 
 is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
 is-unicode-supported@^0.1.0:
   version "0.1.0"
@@ -4125,7 +4617,7 @@ is-unicode-supported@^0.1.0:
 is-utf8@0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
+  integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==
 
 is-weakref@^1.0.2:
   version "1.0.2"
@@ -4134,11 +4626,6 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-whitespace@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-whitespace/-/is-whitespace-0.3.0.tgz#1639ecb1be036aec69a54cbb401cfbed7114ab7f"
-  integrity sha1-Fjnssb4DauxppUy7QBz77XEUq38=
-
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -4147,17 +4634,17 @@ is-windows@^1.0.2:
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 isomorphic-textencoder@^1.0.1:
   version "1.0.1"
@@ -4166,7 +4653,7 @@ isomorphic-textencoder@^1.0.1:
   dependencies:
     fast-text-encoding "^1.0.0"
 
-istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.0.0-alpha.1, istanbul-lib-coverage@^3.2.0:
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
   integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
@@ -4189,9 +4676,9 @@ istanbul-lib-instrument@^4.0.0:
     semver "^6.3.0"
 
 istanbul-lib-instrument@^5.0.4:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a"
-  integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz#31d18bdd127f825dd02ea7bfdfd906f8ab840e9f"
+  integrity sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==
   dependencies:
     "@babel/core" "^7.12.3"
     "@babel/parser" "^7.14.7"
@@ -4200,17 +4687,16 @@ istanbul-lib-instrument@^5.0.4:
     semver "^6.3.0"
 
 istanbul-lib-processinfo@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz#e1426514662244b2f25df728e8fd1ba35fe53b9c"
-  integrity sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz#366d454cd0dcb7eb6e0e419378e60072c8626169"
+  integrity sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==
   dependencies:
     archy "^1.0.0"
-    cross-spawn "^7.0.0"
-    istanbul-lib-coverage "^3.0.0-alpha.1"
-    make-dir "^3.0.0"
+    cross-spawn "^7.0.3"
+    istanbul-lib-coverage "^3.2.0"
     p-map "^3.0.0"
     rimraf "^3.0.0"
-    uuid "^3.3.3"
+    uuid "^8.3.2"
 
 istanbul-lib-report@^3.0.0:
   version "3.0.0"
@@ -4247,16 +4733,6 @@ jest-worker@^27.4.5:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-js-beautify@^1.6.12:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.3.tgz#3dd11c949178de7f3bdf3f6f752778d3bed95150"
-  integrity sha512-f1ra8PHtOEu/70EBnmiUlV8nJePS58y9qKjl4JHfYWlFH6bo7ogZBz//FAZp7jDuXtYnGYKymZPlrg2I/9Zo4g==
-  dependencies:
-    config-chain "^1.1.13"
-    editorconfig "^0.15.3"
-    glob "^7.1.3"
-    nopt "^5.0.0"
-
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -4285,7 +4761,7 @@ jsesc@^2.5.1:
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
 json-buffer@3.0.1, json-buffer@~3.0.1:
   version "3.0.1"
@@ -4297,7 +4773,7 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -4315,14 +4791,7 @@ json-schema-traverse@^1.0.0:
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
-  dependencies:
-    minimist "^1.2.0"
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json5@^2.1.2, json5@^2.2.1:
   version "2.2.1"
@@ -4352,20 +4821,13 @@ jws@^4.0.0:
     safe-buffer "^5.0.1"
 
 keyv@^4.0.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.2.2.tgz#4b6f602c0228ef4d8214c03c520bef469ed6b768"
-  integrity sha512-uYS0vKTlBIjNCAUqrjlxmruxOEiZxZIHXyp32sdcGmP+ukFrmWUnE//RcPXJH3Vxrni1H2gsQbjHE0bH7MtMQQ==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.3.0.tgz#b4352e0e4fe7c94111947d6738a6d3fe7903027c"
+  integrity sha512-C30Un9+63J0CsR7Wka5quXKqYZsT6dcRQ2aOwGcSc3RiQ4HGWpTAHlCA+puNfw2jA/s11EsxA1nCXgZRuRKMQQ==
   dependencies:
-    compress-brotli "^1.3.6"
+    compress-brotli "^1.3.8"
     json-buffer "3.0.1"
 
-kind-of@^3.0.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
 kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
@@ -4384,7 +4846,7 @@ known-css-properties@^0.24.0:
 ldap-filter@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/ldap-filter/-/ldap-filter-0.3.3.tgz#2b14c68a2a9d4104dbdbc910a1ca85fd189e9797"
-  integrity sha1-KxTGiiqdQQTb28kQocqF/Riel5c=
+  integrity sha512-/tFkx5WIn4HuO+6w9lsfxq4FN3O+fDZeO9Mek8dCD8rTUpqzRa766BOBO7BcGkn3X86m5+cBm1/2S/Shzz7gMg==
   dependencies:
     assert-plus "^1.0.0"
 
@@ -4430,7 +4892,7 @@ linkify-it@3.0.3:
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
+  integrity sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
@@ -4442,15 +4904,6 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
-loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^1.0.1"
-
 loader-utils@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
@@ -4474,62 +4927,42 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
-  integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
+  integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==
 
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+  integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
 
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+  integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.template@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
-  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.templatesettings "^4.0.0"
-
-lodash.templatesettings@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
-  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-
 lodash.truncate@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
+  integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+  integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21:
+lodash@4.17.21, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -4554,14 +4987,6 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
-lru-cache@^4.1.2, lru-cache@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -4569,6 +4994,13 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+magic-string@^0.25.7:
+  version "0.25.9"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
+  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
+  dependencies:
+    sourcemap-codec "^1.4.8"
+
 make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -4576,6 +5008,11 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
 make-fetch-happen@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
@@ -4601,7 +5038,7 @@ make-fetch-happen@^9.1.0:
 map-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
+  integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
 
 map-obj@^4.0.0:
   version "4.3.0"
@@ -4621,19 +5058,19 @@ mdn-data@2.0.14:
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
 memfs@^3.2.2:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305"
-  integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.4.tgz#e8973cd8060548916adcca58a248e7805c715e89"
+  integrity sha512-W4gHNUE++1oSJVn8Y68jPXi+mkx3fXR5ITE/Ubz6EQ3xRpCN5k2CQ4AUR8094Z7211F876TyoBACGsIveqgiGA==
   dependencies:
     fs-monkey "1.0.3"
 
 memorystream@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
-  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
+  integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==
 
 meow@^9.0.0:
   version "9.0.0"
@@ -4656,14 +5093,7 @@ meow@^9.0.0:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
-
-merge-source-map@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
-  integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
-  dependencies:
-    source-map "^0.6.1"
+  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
 
 merge-stream@^2.0.0:
   version "2.0.0"
@@ -4678,9 +5108,9 @@ merge2@^1.3.0, merge2@^1.4.1:
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^4.0.4:
+micromatch@^4.0.0, micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -4691,7 +5121,7 @@ micromatch@^4.0.4:
 middleware-handler@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/middleware-handler/-/middleware-handler-0.2.0.tgz#bf02af7e6b577c0230609b2ae58df0e446f3fd02"
-  integrity sha1-vwKvfmtXfAIwYJsq5Y3w5Ebz/QI=
+  integrity sha512-Qz4B0yWndSokapr3Kl7fpMRysS0DaBlOuATrExFuZbr+oXZ3rsAPufdLe8mUJXiG5A4aJGW6GfKS4PDfQwu7Mg==
 
 mime-db@1.51.0:
   version "1.51.0"
@@ -4761,7 +5191,7 @@ minimatch@3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^3.0.4:
+minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -4884,7 +5314,7 @@ mri@^1.1.5:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
 ms@2.1.2:
   version "2.1.2"
@@ -4917,15 +5347,15 @@ nanoid@3.2.0:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
   integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
 
-nanoid@^3.2.0, nanoid@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557"
-  integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==
+nanoid@^3.2.0, nanoid@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 negotiator@0.6.3, negotiator@^0.6.2:
   version "0.6.3"
@@ -4942,6 +5372,17 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+nise@^4.0.4:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-4.1.0.tgz#8fb75a26e90b99202fa1e63f448f58efbcdedaf6"
+  integrity sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+    "@sinonjs/fake-timers" "^6.0.0"
+    "@sinonjs/text-encoding" "^0.7.1"
+    just-extend "^4.0.2"
+    path-to-regexp "^1.7.0"
+
 nise@^5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.1.tgz#ac4237e0d785ecfcb83e20f389185975da5c31f3"
@@ -4993,15 +5434,10 @@ node-preload@^0.2.1:
   dependencies:
     process-on-spawn "^1.0.0"
 
-node-releases@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.3.tgz#225ee7488e4a5e636da8da52854844f9d716ca96"
-  integrity sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==
-
-node-releases@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476"
-  integrity sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==
+node-releases@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
+  integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==
 
 nopt@^5.0.0:
   version "5.0.0"
@@ -5038,12 +5474,12 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
+  integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
 normalize-selector@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
-  integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
+  integrity sha512-dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw==
 
 normalize-url@^6.0.1:
   version "6.1.0"
@@ -5088,19 +5524,19 @@ npmlog@^5.0.1:
     set-blocking "^2.0.0"
 
 npmlog@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.1.tgz#06f1344a174c06e8de9c6c70834cfba2964bba17"
-  integrity sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
   dependencies:
     are-we-there-yet "^3.0.0"
     console-control-strings "^1.1.0"
-    gauge "^4.0.0"
+    gauge "^4.0.3"
     set-blocking "^2.0.0"
 
 nth-check@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
-  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
+  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
   dependencies:
     boolbase "^1.0.0"
 
@@ -5140,14 +5576,14 @@ nyc@15.1.0:
 object-assign@^4, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-inspect@^1.12.0, object-inspect@^1.9.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
-  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
 
-object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -5165,14 +5601,14 @@ object.assign@^4.1.0, object.assign@^4.1.2:
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
   dependencies:
     ee-first "1.1.1"
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
@@ -5208,7 +5644,7 @@ p-cancelable@^2.0.0:
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
 p-limit@^2.2.0:
   version "2.3.0"
@@ -5287,7 +5723,7 @@ parent-module@^1.0.0:
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+  integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -5337,12 +5773,12 @@ path-exists@^4.0.0:
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
@@ -5357,7 +5793,7 @@ path-parse@^1.0.7:
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
 path-to-regexp@^1.7.0:
   version "1.8.0"
@@ -5388,11 +5824,6 @@ peek-readable@^4.1.0:
   resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-4.1.0.tgz#4ece1111bf5c2ad8867c314c81356847e8a62e72"
   integrity sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==
 
-picocolors@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
-  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
-
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
@@ -5411,12 +5842,12 @@ pidtree@^0.3.0:
 pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
 pify@^4.0.1:
   version "4.0.1"
@@ -5445,11 +5876,11 @@ please-upgrade-node@^3.2.0:
     semver-compare "^1.0.0"
 
 postcss-attribute-case-insensitive@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.0.tgz#39cbf6babf3ded1e4abf37d09d6eda21c644105c"
-  integrity sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.1.tgz#86d323c77ab8896ed90500071c2c8329fba64fda"
+  integrity sha512-wrt2VndqSLJpyBRNz9OmJcgnhI9MaongeWgapdBuUMu2a/KNJ8SENesG4SdiTnQwGO9b1VKbTWYAfCPeokLqZQ==
   dependencies:
-    postcss-selector-parser "^6.0.2"
+    postcss-selector-parser "^6.0.10"
 
 postcss-calc@^8.2.3:
   version "8.2.4"
@@ -5467,9 +5898,9 @@ postcss-clamp@^3.0.0:
     postcss-value-parser "^4.1.0"
 
 postcss-color-functional-notation@^4.2.1:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.2.tgz#f59ccaeb4ee78f1b32987d43df146109cc743073"
-  integrity sha512-DXVtwUhIk4f49KK5EGuEdgx4Gnyj6+t2jBSEmxvpIK9QI40tWrpS2Pua8Q7iIZWBrki2QOaeUdEaLPPa91K0RQ==
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.3.tgz#23c9d73c76113b75473edcf66f443c6f1872bd0f"
+  integrity sha512-5fbr6FzFzjwHXKsVnkmEYrJYG8VNNzvD1tAXaPPWR97S6rhKI5uh2yOfV5TAzhDkZoq4h+chxEplFDc8GeyFtw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -5497,17 +5928,20 @@ postcss-colormin@^5.3.0:
     colord "^2.9.1"
     postcss-value-parser "^4.2.0"
 
-postcss-convert-values@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz#f8d3abe40b4ce4b1470702a0706343eac17e7c10"
-  integrity sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g==
+postcss-convert-values@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz#31586df4e184c2e8890e8b34a0b9355313f503ab"
+  integrity sha512-c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g==
   dependencies:
+    browserslist "^4.20.3"
     postcss-value-parser "^4.2.0"
 
 postcss-custom-media@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz#1be6aff8be7dc9bf1fe014bde3b71b92bb4552f1"
-  integrity sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz#c8f9637edf45fef761b014c024cee013f80529ea"
+  integrity sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==
+  dependencies:
+    postcss-value-parser "^4.2.0"
 
 postcss-custom-properties@^12.1.4:
   version "12.1.7"
@@ -5517,9 +5951,9 @@ postcss-custom-properties@^12.1.4:
     postcss-value-parser "^4.2.0"
 
 postcss-custom-selectors@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.0.tgz#022839e41fbf71c47ae6e316cb0e6213012df5ef"
-  integrity sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz#1ab4684d65f30fed175520f82d223db0337239d9"
+  integrity sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
@@ -5530,10 +5964,10 @@ postcss-dir-pseudo-class@^6.0.3:
   dependencies:
     postcss-selector-parser "^6.0.9"
 
-postcss-discard-comments@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz#e90019e1a0e5b99de05f63516ce640bd0df3d369"
-  integrity sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==
+postcss-discard-comments@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696"
+  integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==
 
 postcss-discard-duplicates@^5.1.0:
   version "5.1.0"
@@ -5640,20 +6074,20 @@ postcss-media-minmax@^5.0.0:
 postcss-media-query-parser@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
-  integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=
+  integrity sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==
 
-postcss-merge-longhand@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz#0f46f8753989a33260efc47de9a0cdc571f2ec5c"
-  integrity sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA==
+postcss-merge-longhand@^5.1.5:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.5.tgz#b0e03bee3b964336f5f33c4fc8eacae608e91c05"
+  integrity sha512-NOG1grw9wIO+60arKa2YYsrbgvP6tp+jqc7+ZD5/MalIw234ooH2C6KlR6FEn4yle7GqZoBxSK1mLBE9KPur6w==
   dependencies:
     postcss-value-parser "^4.2.0"
     stylehacks "^5.1.0"
 
-postcss-merge-rules@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz#d327b221cd07540bcc8d9ff84446d8b404d00162"
-  integrity sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww==
+postcss-merge-rules@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz#7049a14d4211045412116d79b751def4484473a5"
+  integrity sha512-zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ==
   dependencies:
     browserslist "^4.16.6"
     caniuse-api "^3.0.0"
@@ -5676,19 +6110,19 @@ postcss-minify-gradients@^5.1.1:
     cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-minify-params@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz#77e250780c64198289c954884ebe3ee4481c3b1c"
-  integrity sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g==
+postcss-minify-params@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz#ac41a6465be2db735099bbd1798d85079a6dc1f9"
+  integrity sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg==
   dependencies:
     browserslist "^4.16.6"
     cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-minify-selectors@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz#17c2be233e12b28ffa8a421a02fc8b839825536c"
-  integrity sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==
+postcss-minify-selectors@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6"
+  integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==
   dependencies:
     postcss-selector-parser "^6.0.5"
 
@@ -5721,10 +6155,11 @@ postcss-modules-values@^4.0.0:
     icss-utils "^5.0.0"
 
 postcss-nesting@^10.1.2:
-  version "10.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.4.tgz#80de9d1c2717bc44df918dd7f118929300192a7a"
-  integrity sha512-2ixdQ59ik/Gt1+oPHiI1kHdwEI8lLKEmui9B1nl6163ANLC+GewQn7fXMxJF2JSb4i2MKL96GU8fIiQztK4TTA==
+  version "10.1.8"
+  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.8.tgz#1675542cfedc3dc9621993f3abfdafa260c3a460"
+  integrity sha512-txdb3/idHYsBbNDFo1PFY0ExCgH5nfWi8G5lO49e6iuU42TydbODTzJgF5UuL5bhgeSlnAtDgfFTDG0Cl1zaSQ==
   dependencies:
+    "@csstools/selector-specificity" "^2.0.0"
     postcss-selector-parser "^6.0.10"
 
 postcss-normalize-charset@^5.1.0:
@@ -5795,10 +6230,10 @@ postcss-opacity-percentage@^1.1.1:
   resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz#bd698bb3670a0a27f6d657cc16744b3ebf3b1145"
   integrity sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w==
 
-postcss-ordered-values@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz#0b41b610ba02906a3341e92cab01ff8ebc598adb"
-  integrity sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw==
+postcss-ordered-values@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.2.tgz#daffacd4abf327d52d5ac570b59dfbcf4b836614"
+  integrity sha512-wr2avRbW4HS2XE2ZCqpfp4N/tDC6GZKZ+SVP8UBTOVS8QWrc4TD8MYrebJrvVVlGPKszmiSCzue43NDiVtgDmg==
   dependencies:
     cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
@@ -5865,9 +6300,9 @@ postcss-preset-env@7.3.0:
     postcss-selector-not "^5.0.0"
 
 postcss-pseudo-class-any-link@^7.1.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.2.tgz#81ec491aa43f97f9015e998b7a14263b4630bdf0"
-  integrity sha512-76XzEQv3g+Vgnz3tmqh3pqQyRojkcJ+pjaePsyhcyf164p9aZsu3t+NWxkZYbcHLK1ju5Qmalti2jPI5IWCe5w==
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.4.tgz#ac72aac4fe11fc4a0a368691f8fd5fe89e95aba4"
+  integrity sha512-JxRcLXm96u14N3RzFavPIE9cRPuOqLDuzKeBsqi4oRk4vt8n0A7I0plFs/VXTg7U2n7g/XkQi0OwqTO3VWBfEg==
   dependencies:
     postcss-selector-parser "^6.0.10"
 
@@ -5894,7 +6329,7 @@ postcss-replace-overflow-wrap@^4.0.0:
 postcss-resolve-nested-selector@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
-  integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
+  integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==
 
 postcss-safe-parser@^6.0.0:
   version "6.0.0"
@@ -5945,27 +6380,19 @@ postcss@8.4.6:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^7.0.36:
-  version "7.0.39"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
-  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
+postcss@^8.1.10, postcss@^8.2.15, postcss@^8.4.5:
+  version "8.4.14"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
+  integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
   dependencies:
-    picocolors "^0.2.1"
-    source-map "^0.6.1"
-
-postcss@^8.2.15, postcss@^8.4.5:
-  version "8.4.12"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905"
-  integrity sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==
-  dependencies:
-    nanoid "^3.3.1"
+    nanoid "^3.3.4"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
 precond@0.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac"
-  integrity sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw=
+  integrity sha512-QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ==
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -5977,11 +6404,6 @@ prettier@2.5.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
   integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
 
-"prettier@^1.18.2 || ^2.0.0":
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
-  integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
-
 pretty-quick@3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-3.1.3.tgz#15281108c0ddf446675157ca40240099157b638e"
@@ -5994,15 +6416,6 @@ pretty-quick@3.1.3:
     mri "^1.1.5"
     multimatch "^4.0.0"
 
-pretty@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pretty/-/pretty-2.0.0.tgz#adbc7960b7bbfe289a557dc5f737619a220d06a5"
-  integrity sha1-rbx5YLe7/iiaVX3F9zdhmiINBqU=
-  dependencies:
-    condense-newlines "^0.2.1"
-    extend-shallow "^2.0.1"
-    js-beautify "^1.6.12"
-
 primer-support@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/primer-support/-/primer-support-5.0.0.tgz#d19c7cea59e8783400b9391943c8a2bb2ebddc5e"
@@ -6025,7 +6438,7 @@ process-on-spawn@^1.0.0:
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
 
 promise-retry@^2.0.1:
   version "2.0.1"
@@ -6035,11 +6448,6 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
-
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -6048,11 +6456,6 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -6126,7 +6529,7 @@ rc@^1.2.8:
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
+  integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==
   dependencies:
     pify "^2.3.0"
 
@@ -6150,7 +6553,7 @@ read-pkg-up@^7.0.1:
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
+  integrity sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
@@ -6169,7 +6572,7 @@ read-pkg@^5.2.0:
 read@1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
-  integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
+  integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
   dependencies:
     mute-stream "~0.0.4"
 
@@ -6235,6 +6638,15 @@ regenerator-transform@^0.15.0:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
+regexp.prototype.flags@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    functions-have-names "^1.2.2"
+
 regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
@@ -6281,14 +6693,14 @@ regjsparser@^0.8.2:
 release-zalgo@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730"
-  integrity sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=
+  integrity sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==
   dependencies:
     es6-error "^4.0.1"
 
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 require-from-string@^2.0.2:
   version "2.0.2"
@@ -6322,7 +6734,7 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.2.0, resolve@^1.9.0:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.9.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -6341,7 +6753,7 @@ responselike@^2.0.0:
 retry@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
 
 reusify@^1.0.4:
   version "1.0.4"
@@ -6408,14 +6820,14 @@ schema-utils@^4.0.0:
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+  integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
 semver-regex@^3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz#b2bcc6f97f63269f286994e297e229b6245d0dc3"
-  integrity sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ==
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.4.tgz#13053c0d4aa11d070a2f2872b6b1e3ae1e1971b4"
+  integrity sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA==
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -6437,7 +6849,7 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.4, semver@^7.3.5:
+semver@^7.3.4, semver@^7.3.5, semver@^7.3.6:
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
   integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
@@ -6470,13 +6882,6 @@ serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
-serialize-javascript@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
-  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
-  dependencies:
-    randombytes "^2.1.0"
-
 serve-static@1.14.2:
   version "1.14.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
@@ -6542,11 +6947,6 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-sigmund@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
-
 signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
@@ -6564,6 +6964,18 @@ sinon@13.0.0:
     nise "^5.1.0"
     supports-color "^7.2.0"
 
+sinon@^9.0.3:
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.4.tgz#e55af4d3b174a4443a8762fa8421c2976683752b"
+  integrity sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==
+  dependencies:
+    "@sinonjs/commons" "^1.8.1"
+    "@sinonjs/fake-timers" "^6.0.1"
+    "@sinonjs/samsam" "^5.3.1"
+    diff "^4.0.2"
+    nise "^4.0.4"
+    supports-color "^7.1.0"
+
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -6635,15 +7047,15 @@ socket.io@4.4.1:
     socket.io-parser "~4.0.4"
 
 socks-proxy-agent@^6.0.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87"
-  integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
+  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
   dependencies:
     agent-base "^6.0.2"
-    debug "^4.3.1"
-    socks "^2.6.1"
+    debug "^4.3.3"
+    socks "^2.6.2"
 
-socks@^2.6.1:
+socks@^2.6.1, socks@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
   integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
@@ -6651,7 +7063,7 @@ socks@^2.6.1:
     ip "^1.1.5"
     smart-buffer "^4.2.0"
 
-sortablejs@1.10.2, sortablejs@1.15.0:
+sortablejs@1.15.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.0.tgz#53230b8aa3502bb77a29e2005808ffdb4a5f7e2a"
   integrity sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==
@@ -6669,25 +7081,15 @@ source-map-support@~0.5.20:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
-
-source-map@^0.5.0:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+sourcemap-codec@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
 spawn-wrap@^2.0.0:
   version "2.0.0"
@@ -6791,21 +7193,23 @@ string.prototype.padend@^3.0.0:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+string.prototype.trimend@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
+  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
 
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+string.prototype.trimstart@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
+  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -6814,13 +7218,6 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -6953,11 +7350,6 @@ supports-color@8.1.1, supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -7032,24 +7424,24 @@ tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
     yallist "^4.0.0"
 
 terser-webpack-plugin@^5.1.3:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54"
-  integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz#8033db876dd5875487213e87c627bca323e5ed90"
+  integrity sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.7"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
     serialize-javascript "^6.0.0"
-    source-map "^0.6.1"
     terser "^5.7.2"
 
 terser@^5.7.2:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.12.1.tgz#4cf2ebed1f5bceef5c83b9f60104ac4a78b49e9c"
-  integrity sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.0.tgz#eefeec9af5153f55798180ee2617f390bdd285e2"
+  integrity sha512-JC6qfIEkPBd9j1SMO3Pfn+A6w2kQV54tv+ABQLgZr7dA3k/DL/OBoYSWxzVpZev3J+bUHXfr55L8Mox7AaNo6g==
   dependencies:
+    "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
     commander "^2.20.0"
-    source-map "~0.7.2"
     source-map-support "~0.5.20"
 
 test-exclude@^6.0.0:
@@ -7123,10 +7515,61 @@ trim-repeated@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
+ts-loader@9.3.0:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.3.0.tgz#980f4dbfb60e517179e15e10ed98e454b132159f"
+  integrity sha512-2kLLAdAD+FCKijvGKi9sS0OzoqxLCF3CxHpok7rVgCZ5UldRzH0TkbwG9XECKjBzHsAewntC5oDaI/FwKzEUog==
+  dependencies:
+    chalk "^4.1.0"
+    enhanced-resolve "^5.0.0"
+    micromatch "^4.0.0"
+    semver "^7.3.4"
+
+ts-node@10.7.0:
+  version "10.7.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5"
+  integrity sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==
+  dependencies:
+    "@cspotcode/source-map-support" "0.7.0"
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.2"
+    acorn "^8.4.1"
+    acorn-walk "^8.1.1"
+    arg "^4.1.0"
+    create-require "^1.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    v8-compile-cache-lib "^3.0.0"
+    yn "3.1.1"
+
+ts-sinon@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ts-sinon/-/ts-sinon-2.0.2.tgz#9e020ad1e76b41e71cb7344b71923dbc3c6bc7ca"
+  integrity sha512-Eh6rXPQruACHPn+/e5HsIMaHZa17tGP/scGjUeW5eJ/Levn8hBV6zSP/6QkEDUP7wLkTyY0yeYikjpTzgC9Gew==
+  dependencies:
+    "@types/node" "^14.6.1"
+    "@types/sinon" "^9.0.5"
+    "@types/sinon-chai" "^3.2.4"
+    sinon "^9.0.3"
+
+tslib@^1.8.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
 tslib@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
-  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+
+tsutils@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
@@ -7175,6 +7618,11 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typescript@4.7.2:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4"
+  integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==
+
 ua-parser-js@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.2.tgz#e2976c34dbfb30b15d2c300b2a53eac87c57a775"
@@ -7185,14 +7633,14 @@ uc.micro@^1.0.1:
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
-unbox-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
   dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
 undate@0.3.0, undate@^0.3.0:
@@ -7276,15 +7724,15 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@8.3.2:
+uuid@8.3.2, uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-uuid@^3.3.3:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+v8-compile-cache-lib@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
 
 v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
   version "2.3.0"
@@ -7329,7 +7777,7 @@ verror@^1.8.1:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vue-eslint-parser@^8.0.1:
+vue-eslint-parser@8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz#5d31129a1b3dd89c0069ca0a1c88f970c360bd0d"
   integrity sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==
@@ -7342,83 +7790,57 @@ vue-eslint-parser@^8.0.1:
     lodash "^4.17.21"
     semver "^7.3.5"
 
-vue-hot-reload-api@^2.3.0:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
-  integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
-
-vue-loader@15.9.8:
-  version "15.9.8"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.8.tgz#4b0f602afaf66a996be1e534fb9609dc4ab10e61"
-  integrity sha512-GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog==
+vue-eslint-parser@^9.0.1:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.0.2.tgz#d2535516f3f55adb387939427fe741065eb7948a"
+  integrity sha512-uCPQwTGjOtAYrwnU+76pYxalhjsh7iFBsHwBqDHiOPTxtICDaraO4Szw54WFTNZTAEsgHHzqFOu1mmnBOBRzDA==
   dependencies:
-    "@vue/component-compiler-utils" "^3.1.0"
-    hash-sum "^1.0.2"
-    loader-utils "^1.1.0"
-    vue-hot-reload-api "^2.3.0"
-    vue-style-loader "^4.1.0"
+    debug "^4.3.4"
+    eslint-scope "^7.1.1"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.3.1"
+    esquery "^1.4.0"
+    lodash "^4.17.21"
+    semver "^7.3.6"
 
-vue-router@3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.3.tgz#041048053e336829d05dafacf6a8fb669a2e7999"
-  integrity sha512-FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg==
-
-vue-server-renderer@2.6.14:
-  version "2.6.14"
-  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.14.tgz#c8bffff152df6b47b858818ef8d524d2fc351654"
-  integrity sha512-HifYRa/LW7cKywg9gd4ZtvtRuBlstQBao5ZCWlg40fyB4OPoGfEXAzxb0emSLv4pBDOHYx0UjpqvxpiQFEuoLA==
+vue-loader@17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-17.0.0.tgz#2eaa80aab125b19f00faa794b5bd867b17f85acb"
+  integrity sha512-OWSXjrzIvbF2LtOUmxT3HYgwwubbfFelN8PAP9R9dwpIkj48TVioHhWWSx7W7fk+iF5cgg3CBJRxwTdtLU4Ecg==
   dependencies:
-    chalk "^1.1.3"
-    hash-sum "^1.0.2"
-    he "^1.1.0"
-    lodash.template "^4.5.0"
-    lodash.uniq "^4.5.0"
-    resolve "^1.2.0"
-    serialize-javascript "^3.1.0"
-    source-map "0.5.6"
+    chalk "^4.1.0"
+    hash-sum "^2.0.0"
+    loader-utils "^2.0.0"
 
-vue-style-loader@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35"
-  integrity sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==
+vue-router@4.0.15:
+  version "4.0.15"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.15.tgz#b4a0661efe197f8c724e0f233308f8776e2c3667"
+  integrity sha512-xa+pIN9ZqORdIW1MkN2+d9Ui2pCM1b/UMgwYUCZOiFYHAvz/slKKBDha8DLrh5aCG/RibtrpyhKjKOZ85tYyWg==
   dependencies:
-    hash-sum "^1.0.2"
-    loader-utils "^1.0.2"
+    "@vue/devtools-api" "^6.0.0"
 
-vue-template-compiler@2.6.14:
-  version "2.6.14"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763"
-  integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==
+vue@3.2.35:
+  version "3.2.35"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.35.tgz#e0a63a8b2fcc0334a936d484d646e31b571e3f80"
+  integrity sha512-mc/15B0Wjd/4JMMGOcXUQAeXfjyg8MImA2EVZucNdyDPJe1nXhMNbYXOEVPEGfk/mCeyszCzl44dSAhHhQVH8g==
   dependencies:
-    de-indent "^1.0.2"
-    he "^1.1.0"
+    "@vue/compiler-dom" "3.2.35"
+    "@vue/compiler-sfc" "3.2.35"
+    "@vue/runtime-dom" "3.2.35"
+    "@vue/server-renderer" "3.2.35"
+    "@vue/shared" "3.2.35"
 
-vue-template-es2015-compiler@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
-  integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
-
-vue@2.6.14:
-  version "2.6.14"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
-  integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==
-
-vuedraggable@2.24.3:
-  version "2.24.3"
-  resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-2.24.3.tgz#43c93849b746a24ce503e123d5b259c701ba0d19"
-  integrity sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==
+vuex@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/vuex/-/vuex-4.0.2.tgz#f896dbd5bf2a0e963f00c67e9b610de749ccacc9"
+  integrity sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==
   dependencies:
-    sortablejs "1.10.2"
-
-vuex@3.6.2:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71"
-  integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==
+    "@vue/devtools-api" "^6.0.0-beta.11"
 
 watchpack@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25"
-  integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -7522,6 +7944,36 @@ webpack@5.68.0:
     watchpack "^2.3.1"
     webpack-sources "^3.2.3"
 
+webpack@^5:
+  version "5.73.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38"
+  integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==
+  dependencies:
+    "@types/eslint-scope" "^3.7.3"
+    "@types/estree" "^0.0.51"
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/wasm-edit" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    acorn "^8.4.1"
+    acorn-import-assertions "^1.7.6"
+    browserslist "^4.14.5"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^5.9.3"
+    es-module-lexer "^0.9.0"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.9"
+    json-parse-even-better-errors "^2.3.1"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.1.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.1.3"
+    watchpack "^2.3.1"
+    webpack-sources "^3.2.3"
+
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -7552,16 +8004,16 @@ which-pm-runs@^1.0.0:
   integrity sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==
 
 which-typed-array@^1.1.2:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.7.tgz#2761799b9a22d4b8660b3c1b40abaa7739691793"
-  integrity sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f"
+  integrity sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==
   dependencies:
     available-typed-arrays "^1.0.5"
     call-bind "^1.0.2"
-    es-abstract "^1.18.5"
-    foreach "^2.0.5"
+    es-abstract "^1.20.0"
+    for-each "^0.3.3"
     has-tostringtag "^1.0.0"
-    is-typed-array "^1.1.7"
+    is-typed-array "^1.1.9"
 
 which@2.0.2, which@^2.0.1, which@^2.0.2:
   version "2.0.2"
@@ -7654,6 +8106,11 @@ ws@~8.2.3:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
   integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
 
+xml-name-validator@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
+  integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
+
 xmlhttprequest-ssl@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
@@ -7669,11 +8126,6 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
@@ -7752,6 +8204,11 @@ yeast@0.1.2:
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
   integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
+yn@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"