Add src/dist to prettier/eslint ignores, apply lint, webpack adjustments

.eslintignore

@@ -1,2 +1,3 @@
 public/
 coverage/
+src/dist/

.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 = {
 					"<template>": "espree",
 				},
 				tsconfigRootDir: __dirname,
-				project: ["./tsconfig.json", "./client/tsconfig.json", "./src/tsconfig.json"],
+				project: projects,
 			},
 			plugins: ["vue"],
 			extends: [

.prettierignore

@@ -3,7 +3,7 @@ public/
 test/fixtures/.thelounge/logs/
 test/fixtures/.thelounge/certificates/
 test/fixtures/.thelounge/storage/
-
+src/dist/
 *.log
 *.png
 *.svg

babel.config.cjs

@@ -6,5 +6,4 @@ module.exports = {
 		// "@vue/babel-preset-jsx",
 	],
 	targets: "> 0.25%, not dead",
-	// plugins: [["@babel/transform-typescript", {allowNamespaces: true}]],
 };

client/components/MessageTypes/index.ts

@@ -6,7 +6,7 @@
 // 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;

client/components/NetworkList.vue

@@ -195,7 +195,7 @@
 }
 </style>
 
-<script>
+<script lang="ts">
 import Mousetrap from "mousetrap";
 import Draggable from "vuedraggable";
 import {filter as fuzzyFilter} from "fuzzy";
@@ -209,6 +209,9 @@ import isIgnoredKeybind from "../js/helpers/isIgnoredKeybind";
 import distance from "../js/helpers/distance";
 import eventbus from "../js/eventbus";
 
+import NetworkModel from "../../src/models/network";
+import ChannelMode from "../../src/models/chan";
+
 export default {
 	name: "NetworkList",
 	components: {

client/js/auth.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import storage from "./localStorage";
 import location from "./location";
 

client/js/autocompletion.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import constants from "./constants";
 
 import Mousetrap from "mousetrap";

client/js/clipboard.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 export default function (chat) {
 	// Disable in Firefox as it already copies flex text correctly
 	if (typeof window.InstallTrigger !== "undefined") {

client/js/commands/collapse.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/commands/expand.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/commands/index.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 // Taken from views/index.js
 
 // This creates a version of `require()` in the context of the current

client/js/commands/join.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 import {switchToChannel} from "../router";

client/js/commands/search.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import store from "../store";
 import {router} from "../router";
 

client/js/constants.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 const colorCodeMap = [
 	["00", "White"],
 	["01", "Black"],

client/js/eventbus.ts

@@ -3,11 +3,8 @@ const events = new Map();
 class EventBus {
 	/**
 	 * Register an event handler for the given type.
-	 *
-	 * @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: Function) {
 		if (events.has(type)) {
 			events.get(type).push(handler);
 		} else {
@@ -21,11 +18,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: Function) {
 		if (events.has(type)) {
 			events.set(
 				type,
-				events.get(type).filter((item) => item !== handler)
+				events.get(type).filter((item: Function) => item !== handler)
 			);
 		}
 	}
@@ -36,12 +33,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: (...evt: any[]) => void) => {
 					handler(...evt);
 				});
 		}

client/js/helpers/collapseNetwork.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import storage from "../localStorage";
 
 export default (network, isCollapsed) => {

client/js/helpers/colorClass.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 // Generates a string from "color-1" to "color-32" based on an input string
 export default (str) => {
 	let hash = 0;

client/js/helpers/contextMenu.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import eventbus from "../eventbus";
 

client/js/helpers/friendlysize.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 const sizes = ["Bytes", "KiB", "MiB", "GiB", "TiB", "PiB"];
 
 export default (size: number) => {

client/js/helpers/ircmessageparser/anyIntersection.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import {ParsedStyle} from "./parseStyle";
 
 // Return true if any section of "a" or "b" parts (defined by their start/end

client/js/helpers/ircmessageparser/cleanIrcMessage.ts

@@ -1,5 +1,3 @@
-"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;
 

client/js/helpers/ircmessageparser/fill.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import {ParsedStyle} from "./parseStyle";
 
 // Create plain text entries corresponding to areas of the text that match no

client/js/helpers/ircmessageparser/findChannels.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 // Escapes the RegExp special characters "^", "$", "", ".", "*", "+", "?", "(",
 // ")", "[", "]", "{", "}", and "|" in string.
 // See https://lodash.com/docs/#escapeRegExp

client/js/helpers/ircmessageparser/findEmoji.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 const emojiRegExp = require("emoji-regex")();
 
 function findEmoji(text) {

client/js/helpers/ircmessageparser/findLinks.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import LinkifyIt, {Match} from "linkify-it";
 
 type OurMatch = Match & {

client/js/helpers/ircmessageparser/findNames.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 const nickRegExp = /([\w[\]\\`^{|}-]+)/g;
 
 function findNames(text, users) {

client/js/helpers/ircmessageparser/merge.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import anyIntersection from "./anyIntersection";
 import fill from "./fill";
 

client/js/helpers/ircmessageparser/parseStyle.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 // Styling control codes
 const BOLD = "\x02";
 const COLOR = "\x03";

client/js/helpers/isChannelCollapsed.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import store from "../store";
 
 export default (network, channel) => {

client/js/helpers/isIgnoredKeybind.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 export default (event: MouseEvent | Mousetrap.ExtendedKeyboardEvent) => {
 	if (
 		(event.target as HTMLElement).tagName !== "TEXTAREA" &&

client/js/helpers/listenForTwoFingerSwipes.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import distance from "./distance";
 
 // onTwoFingerSwipe will be called with a cardinal direction ("n", "e", "s" or

client/js/helpers/localetime.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import dayjs from "dayjs";
 
 export default (time: Date | number) => dayjs(time).format("D MMMM YYYY, HH:mm:ss");

client/js/helpers/parse.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import parseStyle from "./ircmessageparser/parseStyle";
 import findChannels from "./ircmessageparser/findChannels";
 import {findLinks} from "./ircmessageparser/findLinks";

client/js/helpers/parseIrcUri.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 export default (stringUri) => {
 	const data = {};
 

client/js/helpers/roundBadgeNumber.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 export default (count) => {
 	if (count < 1000) {
 		return count.toString();

client/js/keybinds.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import Mousetrap from "mousetrap";
 
 import store from "./store";

client/js/loading-error-handlers.js

@@ -10,11 +10,12 @@
 
 (function () {
 	const msg = document.getElementById("loading-page-message");
-	msg.textContent = "Loading the app…";
 
-	document
+	if (msg) {
-		.getElementById("loading-reload")
+		msg.textContent = "Loading the app…";
-		.addEventListener("click", () => location.reload(true));
+	}
+
+	document.getElementById("loading-reload")?.addEventListener("click", () => location.reload());
 
 	const displayReload = () => {
 		const loadingReload = document.getElementById("loading-reload");
@@ -26,7 +27,11 @@
 
 	const loadingSlowTimeout = setTimeout(() => {
 		const loadingSlow = document.getElementById("loading-slow");
-		loadingSlow.style.visibility = "visible";
+
+		if (loadingSlow) {
+			loadingSlow.style.visibility = "visible";
+		}
+
 		displayReload();
 	}, 5000);
 

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

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 {

client/js/router.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import constants from "./constants";
 
 import Vue from "vue";

client/js/socket-events/auth.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import storage from "../localStorage";
 import {router, navigate} from "../router";

client/js/socket-events/changelog.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/socket-events/configuration.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import upload from "../upload";
 import store from "../store";

client/js/socket-events/history_clear.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/socket-events/index.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import "./connection";
 import "./auth";
 import "./commands";

client/js/socket-events/init.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import Vue from "vue";
 import socket from "../socket";
 import storage from "../localStorage";

client/js/socket-events/join.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 import {switchToChannel} from "../router";

client/js/socket-events/mentions.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/socket-events/more.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import Vue from "vue";
 
 import socket from "../socket";

client/js/socket-events/msg.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import cleanIrcMessage from "../helpers/ircmessageparser/cleanIrcMessage";
 import store from "../store";

client/js/socket-events/msg_preview.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import Vue from "vue";
 
 import socket from "../socket";

client/js/socket-events/msg_special.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 import {switchToChannel} from "../router";

client/js/socket-events/names.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/socket-events/network.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import Vue from "vue";
 
 import socket from "../socket";

client/js/socket-events/nick.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/socket-events/open.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/socket-events/part.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 import {switchToChannel} from "../router";

client/js/socket-events/quit.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import {switchToChannel, navigate} from "../router";
 import store from "../store";

client/js/socket-events/sessions_list.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/socket-events/setting.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/socket-events/sign_out.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import Auth from "../auth";
 

client/js/socket-events/sync_sort.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/socket-events/topic.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/socket-events/users.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 

client/js/socket.ts

@@ -1,9 +1,7 @@
-"use strict";
+import io, {Socket} from "socket.io-client";
-
-import io from "socket.io-client";
 
 const socket = io({
-	transports: JSON.parse(document.body.dataset.transports),
+	transports: JSON.parse(document.body.dataset.transports || "['polling', 'websocket']"),
 	path: window.location.pathname + "socket.io/",
 	autoConnect: false,
 	reconnection: !document.body.classList.contains("public"),
@@ -14,4 +12,10 @@ if (process.env.NODE_ENV === "development") {
 	window.socket = socket;
 }
 
+declare global {
+	interface Window {
+		socket: Socket;
+	}
+}
+
 export default socket;

client/js/upload.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import {update as updateCursor} from "undate";
 
 import socket from "./socket";

client/js/vue.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import constants from "./constants";
 
 import "../css/style.css";

client/js/webpush.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "./socket";
 import store from "./store";
 

package.json

@@ -19,13 +19,13 @@
     "dev": "NODE_ENV=development ts-node --project src/tsconfig.json src/index.ts start --dev",
     "format:prettier": "prettier --write \"**/*.*\"",
     "lint:check-eslint": "eslint-config-prettier .eslintrc.cjs",
-    "lint:eslint": "eslint . --report-unused-disable-directives --color",
+    "lint:eslint": "eslint . --ext .js,.ts,.vue --report-unused-disable-directives --color",
     "lint:prettier": "prettier --list-different \"**/*.*\"",
     "lint:stylelint": "stylelint --color \"client/**/*.css\"",
     "lint:tsc": "tsc --noEmit",
     "start": "node src/dist/src/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": "NODE_ENV=test webpack --mode=development && nyc --nycrc-path=test/.nycrc-mocha.json mocha --colors --config=test/.mocharc.yml",
     "watch": "webpack --watch"
   },
   "keywords": [

src/client.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import UAParser from "ua-parser-js";
 import {v4 as uuidv4} from "uuid";

src/clientManager.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import colors from "chalk";
 import crypto from "crypto";

src/command-line/index.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../log";
 import fs from "fs";
 import path from "path";

src/command-line/install.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../log";
 import colors from "chalk";
 import semver from "semver";

src/command-line/outdated.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import {Command} from "commander";
 import Utils from "./utils";
 import packageManager from "../plugins/packages";

src/command-line/start.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../log";
 import colors from "chalk";
 import fs from "fs";

src/command-line/uninstall.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../log";
 import colors from "chalk";
 import {Command} from "commander";

src/command-line/upgrade.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../log";
 import colors from "chalk";
 import {Command} from "commander";

src/command-line/users/add.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../../log";
 import colors from "chalk";
 import {Command} from "commander";

src/command-line/users/edit.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../../log";
 import {Command} from "commander";
 import child from "child_process";

src/command-line/users/index.ts

@@ -1,17 +1,22 @@
-"use strict";
-
 import config from "../../config";
 import list from "./list";
 import remove from "./remove";
 import edit from "./edit";
+import log from "../../log";
 
 let add, reset;
 
-(async () => {
+const importAddAndReest = async (): Promise<void> => {
-	if (config.values.ldap.enable) {
+	if (!config.values.ldap.enable) {
 		add = (await import("./add")).default;
 		reset = (await import("./reset")).default;
 	}
-})();
+};
+
+(async () => {
+	await importAddAndReest();
+})().catch((e: any) => {
+	log.error("Unable to load plugins all command-line plugins:", e);
+});
 
 export default [list, remove, edit, add, reset];

src/command-line/users/list.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../../log";
 import colors from "chalk";
 import {Command} from "commander";

src/command-line/users/remove.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../../log";
 import colors from "chalk";
 import {Command} from "commander";

src/command-line/users/reset.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../../log";
 import colors from "chalk";
 import {Command} from "commander";

src/command-line/utils.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import log from "../log";
 import colors from "chalk";

src/config.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import path from "path";
 import fs, {Stats} from "fs";
 import os from "os";

src/helper.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import pkg from "../package.json";
 import _ from "lodash";
 import path from "path";

src/identification.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "./log";
 import fs from "fs";
 import net, {Socket} from "net";

src/index.ts

@@ -1,7 +1,5 @@
 #!/usr/bin/env ts-node
 
-"use strict";
-
 process.chdir(__dirname);
 
 // Perform node version check before loading any other files or modules

src/log.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import colors from "chalk";
 import read from "read";
 

src/models/chan.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import log from "../log";
 import Config from "../config";

src/models/msg.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import User from "./user";
 

src/models/network.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import {v4 as uuidv4} from "uuid";
 import IrcFramework, {Client as IRCClient} from "irc-framework";

src/models/prefix.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 type PrefixSymbol = string;
 
 type PrefixObject = {

src/models/user.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import Prefix from "./prefix";
 

src/plugins/auth.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import colors from "chalk";
 import Client from "../client";
 import ClientManager from "../clientManager";

src/plugins/auth/ldap.ts

@@ -1,4 +1,3 @@
-"use strict";
 import ldap, {SearchOptions} from "ldapjs";
 import colors from "chalk";
 

src/plugins/auth/local.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import colors from "chalk";
 import log from "../../log";
 import Helper from "../../helper";

src/plugins/changelog.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import got, {Response} from "got";
 import colors from "chalk";
 import log from "../log";

src/plugins/clientCertificate.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import path from "path";
 import fs from "fs";
 import crypto from "crypto";