From a06bc904ae5aa3dc71a3b9f7ee52d6ac42143b14 Mon Sep 17 00:00:00 2001 From: Max Leiter Date: Fri, 6 May 2022 18:19:44 -0700 Subject: [PATCH] Add src/dist to prettier/eslint ignores, apply lint, webpack adjustments --- .eslintignore | 1 + .eslintrc.cjs | 7 ++++-- .prettierignore | 2 +- babel.config.cjs | 1 - .../MessageTypes/{index.js => index.ts} | 2 +- client/components/NetworkList.vue | 5 +++- client/js/auth.ts | 2 -- client/js/autocompletion.ts | 2 -- client/js/clipboard.ts | 2 -- client/js/commands/collapse.ts | 2 -- client/js/commands/expand.ts | 2 -- client/js/commands/index.ts | 2 -- client/js/commands/join.ts | 2 -- client/js/commands/search.ts | 2 -- client/js/constants.ts | 2 -- client/js/eventbus.ts | 13 ++++------ client/js/helpers/collapseNetwork.ts | 2 -- client/js/helpers/colorClass.ts | 2 -- client/js/helpers/contextMenu.ts | 2 -- client/js/helpers/friendlysize.ts | 2 -- .../ircmessageparser/anyIntersection.ts | 2 -- .../ircmessageparser/cleanIrcMessage.ts | 2 -- client/js/helpers/ircmessageparser/fill.ts | 2 -- .../helpers/ircmessageparser/findChannels.ts | 2 -- .../js/helpers/ircmessageparser/findEmoji.ts | 2 -- .../js/helpers/ircmessageparser/findLinks.ts | 2 -- .../js/helpers/ircmessageparser/findNames.ts | 2 -- client/js/helpers/ircmessageparser/merge.ts | 2 -- .../js/helpers/ircmessageparser/parseStyle.ts | 2 -- client/js/helpers/isChannelCollapsed.ts | 2 -- client/js/helpers/isIgnoredKeybind.ts | 2 -- client/js/helpers/listenForTwoFingerSwipes.ts | 2 -- client/js/helpers/localetime.ts | 2 -- client/js/helpers/parse.ts | 2 -- client/js/helpers/parseIrcUri.ts | 2 -- client/js/helpers/roundBadgeNumber.ts | 2 -- client/js/keybinds.ts | 2 -- client/js/loading-error-handlers.js | 15 +++++++---- client/js/localStorage.ts | 2 -- client/js/location.ts | 2 -- client/js/router.ts | 2 -- client/js/socket-events/auth.ts | 2 -- client/js/socket-events/changelog.ts | 2 -- client/js/socket-events/configuration.ts | 2 -- client/js/socket-events/history_clear.ts | 2 -- client/js/socket-events/index.ts | 2 -- client/js/socket-events/init.ts | 2 -- client/js/socket-events/join.ts | 2 -- client/js/socket-events/mentions.ts | 2 -- client/js/socket-events/more.ts | 2 -- client/js/socket-events/msg.ts | 2 -- client/js/socket-events/msg_preview.ts | 2 -- client/js/socket-events/msg_special.ts | 2 -- client/js/socket-events/names.ts | 2 -- client/js/socket-events/network.ts | 2 -- client/js/socket-events/nick.ts | 2 -- client/js/socket-events/open.ts | 2 -- client/js/socket-events/part.ts | 2 -- client/js/socket-events/quit.ts | 2 -- client/js/socket-events/sessions_list.ts | 2 -- client/js/socket-events/setting.ts | 2 -- client/js/socket-events/sign_out.ts | 2 -- client/js/socket-events/sync_sort.ts | 2 -- client/js/socket-events/topic.ts | 2 -- client/js/socket-events/users.ts | 2 -- client/js/socket.ts | 12 ++++++--- client/js/upload.ts | 2 -- client/js/vue.ts | 2 -- client/js/webpush.ts | 2 -- package.json | 4 +-- src/client.ts | 2 -- src/clientManager.ts | 2 -- src/command-line/index.ts | 2 -- src/command-line/install.ts | 2 -- src/command-line/outdated.ts | 2 -- src/command-line/start.ts | 2 -- src/command-line/uninstall.ts | 2 -- src/command-line/upgrade.ts | 2 -- src/command-line/users/add.ts | 2 -- src/command-line/users/edit.ts | 2 -- src/command-line/users/index.ts | 15 +++++++---- src/command-line/users/list.ts | 2 -- src/command-line/users/remove.ts | 2 -- src/command-line/users/reset.ts | 2 -- src/command-line/utils.ts | 2 -- src/config.ts | 2 -- src/helper.ts | 2 -- src/identification.ts | 2 -- src/index.ts | 2 -- src/log.ts | 2 -- src/models/chan.ts | 2 -- src/models/msg.ts | 2 -- src/models/network.ts | 2 -- src/models/prefix.ts | 2 -- src/models/user.ts | 2 -- src/plugins/auth.ts | 2 -- src/plugins/auth/ldap.ts | 1 - src/plugins/auth/local.ts | 2 -- src/plugins/changelog.ts | 2 -- src/plugins/clientCertificate.ts | 2 -- src/plugins/dev-server.ts | 1 - src/plugins/inputs/action.ts | 2 -- src/plugins/inputs/away.ts | 2 -- src/plugins/inputs/ban.ts | 2 -- src/plugins/inputs/connect.ts | 2 -- src/plugins/inputs/ctcp.ts | 2 -- src/plugins/inputs/disconnect.ts | 1 - src/plugins/inputs/ignore.ts | 2 -- src/plugins/inputs/invite.ts | 2 -- src/plugins/inputs/kick.ts | 1 - src/plugins/inputs/kill.ts | 1 - src/plugins/inputs/list.ts | 1 - src/plugins/inputs/mode.ts | 1 - src/plugins/inputs/msg.ts | 1 - src/plugins/inputs/mute.ts | 1 - src/plugins/inputs/nick.ts | 1 - src/plugins/inputs/notice.ts | 1 - src/plugins/inputs/part.ts | 1 - src/plugins/inputs/quit.ts | 1 - src/plugins/inputs/raw.ts | 1 - src/plugins/inputs/rejoin.ts | 1 - src/plugins/inputs/topic.ts | 1 - src/plugins/inputs/whois.ts | 1 - src/plugins/irc-events/away.ts | 1 - src/plugins/irc-events/cap.ts | 1 - src/plugins/irc-events/chghost.ts | 1 - src/plugins/irc-events/connection.ts | 2 -- src/plugins/irc-events/ctcp.ts | 2 -- src/plugins/irc-events/error.ts | 1 - src/plugins/irc-events/help.ts | 2 -- src/plugins/irc-events/info.ts | 2 -- src/plugins/irc-events/invite.ts | 2 -- src/plugins/irc-events/join.ts | 2 -- src/plugins/irc-events/kick.ts | 1 - src/plugins/irc-events/link.ts | 2 -- src/plugins/irc-events/list.ts | 2 -- src/plugins/irc-events/message.ts | 2 -- src/plugins/irc-events/mode.ts | 2 -- src/plugins/irc-events/modelist.ts | 2 -- src/plugins/irc-events/motd.ts | 2 -- src/plugins/irc-events/names.ts | 2 -- src/plugins/irc-events/nick.ts | 2 -- src/plugins/irc-events/part.ts | 2 -- src/plugins/irc-events/quit.ts | 2 -- src/plugins/irc-events/sasl.ts | 2 -- src/plugins/irc-events/topic.ts | 1 - src/plugins/irc-events/unhandled.ts | 2 -- src/plugins/irc-events/welcome.ts | 1 - src/plugins/irc-events/whois.ts | 2 -- src/plugins/messageStorage/sqlite.ts | 10 +++----- src/plugins/messageStorage/text.ts | 1 - src/plugins/packages/index.ts | 2 -- src/plugins/packages/themes.ts | 2 -- src/plugins/storage.ts | 2 -- src/plugins/sts.ts | 2 -- src/plugins/uploader.ts | 2 -- src/plugins/webpush.ts | 2 -- src/server.ts | 2 -- test/client/index.ts | 2 -- test/client/js/authTest.ts | 2 -- test/client/js/constantsTest.ts | 2 -- test/client/js/helpers/friendlysizeTest.ts | 2 -- .../ircmessageparser/anyIntersection.ts | 2 -- .../ircmessageparser/cleanIrcMessage.ts | 2 -- .../js/helpers/ircmessageparser/fill.ts | 2 -- .../helpers/ircmessageparser/findChannels.ts | 2 -- .../js/helpers/ircmessageparser/findEmoji.ts | 2 -- .../js/helpers/ircmessageparser/findLinks.ts | 2 -- .../js/helpers/ircmessageparser/findNames.ts | 2 -- .../js/helpers/ircmessageparser/merge.ts | 2 -- .../js/helpers/ircmessageparser/parseStyle.ts | 2 -- test/client/js/helpers/localetimeTest.ts | 2 -- test/client/js/helpers/parse.ts | 2 -- test/client/js/helpers/parseIrcUri.ts | 2 -- .../client/js/helpers/roundBadgeNumberTest.ts | 2 -- test/models/network.ts | 25 ++++++++++--------- webpack.config.ts | 2 +- 177 files changed, 65 insertions(+), 350 deletions(-) rename client/components/MessageTypes/{index.js => index.ts} (84%) diff --git a/.eslintignore b/.eslintignore index 1f2ae53f..f47503b7 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,2 +1,3 @@ public/ coverage/ +src/dist/ diff --git a/.eslintrc.cjs b/.eslintrc.cjs index b6cf89e4..6249e49a 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -1,3 +1,5 @@ +const projects = ["./tsconfig.json", "./client/tsconfig.json", "./src/tsconfig.json"]; + module.exports = { root: true, overrides: [ @@ -10,7 +12,8 @@ module.exports = { parserOptions: { tsconfigRootDir: __dirname, project: ["./tsconfig.json", "./client/tsconfig.json", "./src/tsconfig.json"], - // extraFileExtensions: [".vue"], + extraFileExtensions: [".vue"], + projects: projects, }, plugins: ["@typescript-eslint"], extends: [ @@ -58,7 +61,7 @@ module.exports = { "