Add eslint (#243)

.eslintignore

@@ -0,0 +1,9 @@
+dist
+build
+build-cli
+jslib
+webpack.cli.js
+webpack.main.js
+webpack.renderer.js
+
+**/node_modules

.eslintrc.json

@@ -0,0 +1,32 @@
+{
+  "root": true,
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "extends": ["./jslib/shared/eslintrc.json"],
+  "rules": {
+    "import/order": [
+      "error",
+      {
+        "alphabetize": {
+          "order": "asc"
+        },
+        "newlines-between": "always",
+        "pathGroups": [
+          {
+            "pattern": "jslib-*/**",
+            "group": "external",
+            "position": "after"
+          },
+          {
+            "pattern": "src/**/*",
+            "group": "parent",
+            "position": "before"
+          }
+        ],
+        "pathGroupsExcludedImportTypes": ["builtin"]
+      }
+    ]
+  }
+}

.prettierignore

@@ -1,5 +1,6 @@
 # Build directories
 build
+build-cli
 dist
 
 jslib

package.json

@@ -26,8 +26,8 @@
     "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib",
     "rebuild": "electron-rebuild",
     "reset": "rimraf ./node_modules/keytar/* && npm install",
-    "lint": "tslint 'src/**/*.ts' && prettier --check .",
-    "lint:fix": "tslint 'src/**/*.ts' --fix",
+    "lint": "eslint . && prettier --check .",
+    "lint:fix": "eslint . --fix",
     "build": "concurrently -n Main,Rend -c yellow,cyan \"npm run build:main\" \"npm run build:renderer\"",
     "build:main": "webpack --config webpack.main.js",
     "build:renderer": "webpack --config webpack.renderer.js",
@@ -143,6 +143,8 @@
     "@types/ldapjs": "^1.0.10",
     "@types/node": "^16.11.12",
     "@types/proper-lockfile": "^4.1.1",
+    "@typescript-eslint/eslint-plugin": "^5.12.1",
+    "@typescript-eslint/parser": "^5.12.1",
     "clean-webpack-plugin": "^4.0.0",
     "concurrently": "^6.0.2",
     "copy-webpack-plugin": "^10.0.0",
@@ -152,6 +154,10 @@
     "electron-notarize": "^1.1.1",
     "electron-rebuild": "^3.2.5",
     "electron-reload": "^1.5.0",
+    "eslint": "^8.9.0",
+    "eslint-config-prettier": "^8.4.0",
+    "eslint-import-resolver-typescript": "^2.5.0",
+    "eslint-plugin-import": "^2.25.4",
     "html-loader": "^3.0.1",
     "html-webpack-plugin": "^5.5.0",
     "husky": "^7.0.4",
@@ -167,8 +173,6 @@
     "tapable": "^1.1.3",
     "ts-loader": "^9.2.5",
     "tsconfig-paths-webpack-plugin": "^3.5.1",
-    "tslint": "~6.1.0",
-    "tslint-loader": "^3.5.4",
     "typescript": "4.3.5",
     "webpack": "^5.64.4",
     "webpack-cli": "^4.9.1",
@@ -210,6 +214,7 @@
     "npm": "~8"
   },
   "lint-staged": {
-    "./!(jslib)**": "prettier --ignore-unknown --write"
+    "./!(jslib)**": "prettier --ignore-unknown --write",
+    "*.ts": "eslint --fix"
   }
 }

scripts/notarize.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 require("dotenv").config();
 const { notarize } = require("electron-notarize");
 

scripts/sign.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires, no-console */
 exports.default = async function (configuration) {
   if (parseInt(process.env.ELECTRON_BUILDER_SIGN) === 1 && configuration.path.slice(-4) == ".exe") {
     console.log(`[*] Signing file: ${configuration.path}`);

src/abstractions/state.service.ts

@@ -1,9 +1,7 @@
 import { StateService as BaseStateServiceAbstraction } from "jslib-common/abstractions/state.service";
-
 import { StorageOptions } from "jslib-common/models/domain/storageOptions";
 
 import { DirectoryType } from "src/enums/directoryType";
-
 import { Account } from "src/models/account";
 import { AzureConfiguration } from "src/models/azureConfiguration";
 import { GSuiteConfiguration } from "src/models/gsuiteConfiguration";

src/app/accounts/apiKey.component.ts

@@ -1,19 +1,17 @@
 import { Component, Input, ViewChild, ViewContainerRef } from "@angular/core";
 import { Router } from "@angular/router";
 
-import { EnvironmentComponent } from "./environment.component";
-
+import { ModalService } from "jslib-angular/services/modal.service";
 import { AuthService } from "jslib-common/abstractions/auth.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
+import { Utils } from "jslib-common/misc/utils";
+import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials";
 
 import { StateService } from "../../abstractions/state.service";
 
-import { ModalService } from "jslib-angular/services/modal.service";
-
-import { Utils } from "jslib-common/misc/utils";
-import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials";
+import { EnvironmentComponent } from "./environment.component";
 
 @Component({
   selector: "app-apiKey",
@@ -22,12 +20,12 @@ import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials
 export class ApiKeyComponent {
   @ViewChild("environment", { read: ViewContainerRef, static: true })
   environmentModal: ViewContainerRef;
-  @Input() clientId: string = "";
-  @Input() clientSecret: string = "";
+  @Input() clientId = "";
+  @Input() clientSecret = "";
 
   formPromise: Promise<any>;
   successRoute = "/tabs/dashboard";
-  showSecret: boolean = false;
+  showSecret = false;
 
   constructor(
     private authService: AuthService,

src/app/accounts/environment.component.ts

@@ -1,11 +1,10 @@
 import { Component } from "@angular/core";
 
+import { EnvironmentComponent as BaseEnvironmentComponent } from "jslib-angular/components/environment.component";
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 
-import { EnvironmentComponent as BaseEnvironmentComponent } from "jslib-angular/components/environment.component";
-
 @Component({
   selector: "app-environment",
   templateUrl: "environment.component.html",

src/app/app-routing.module.ts

@@ -1,10 +1,9 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
+import { ApiKeyComponent } from "./accounts/apiKey.component";
 import { AuthGuardService } from "./services/auth-guard.service";
 import { LaunchGuardService } from "./services/launch-guard.service";
-
-import { ApiKeyComponent } from "./accounts/apiKey.component";
 import { DashboardComponent } from "./tabs/dashboard.component";
 import { MoreComponent } from "./tabs/more.component";
 import { SettingsComponent } from "./tabs/settings.component";

src/app/app.component.ts

@@ -18,9 +18,8 @@ import { MessagingService } from "jslib-common/abstractions/messaging.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { TokenService } from "jslib-common/abstractions/token.service";
 
-import { SyncService } from "../services/sync.service";
-
 import { StateService } from "../abstractions/state.service";
+import { SyncService } from "../services/sync.service";
 
 const BroadcasterSubscriptionId = "AppComponent";
 

src/app/app.module.ts

@@ -1,27 +1,14 @@
 import "core-js/stable";
 import "zone.js/dist/zone";
 
-import { AppRoutingModule } from "./app-routing.module";
-import { ServicesModule } from "./services/services.module";
-
 import { NgModule } from "@angular/core";
 import { FormsModule } from "@angular/forms";
 import { BrowserModule } from "@angular/platform-browser";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 
-import { AppComponent } from "./app.component";
-
 import { CalloutComponent } from "jslib-angular/components/callout.component";
 import { IconComponent } from "jslib-angular/components/icon.component";
 import { BitwardenToastModule } from "jslib-angular/components/toastr.component";
-
-import { ApiKeyComponent } from "./accounts/apiKey.component";
-import { EnvironmentComponent } from "./accounts/environment.component";
-import { DashboardComponent } from "./tabs/dashboard.component";
-import { MoreComponent } from "./tabs/more.component";
-import { SettingsComponent } from "./tabs/settings.component";
-import { TabsComponent } from "./tabs/tabs.component";
-
 import { A11yTitleDirective } from "jslib-angular/directives/a11y-title.directive";
 import { ApiActionDirective } from "jslib-angular/directives/api-action.directive";
 import { AutofocusDirective } from "jslib-angular/directives/autofocus.directive";
@@ -30,10 +17,19 @@ import { BoxRowDirective } from "jslib-angular/directives/box-row.directive";
 import { FallbackSrcDirective } from "jslib-angular/directives/fallback-src.directive";
 import { StopClickDirective } from "jslib-angular/directives/stop-click.directive";
 import { StopPropDirective } from "jslib-angular/directives/stop-prop.directive";
-
 import { I18nPipe } from "jslib-angular/pipes/i18n.pipe";
 import { SearchCiphersPipe } from "jslib-angular/pipes/search-ciphers.pipe";
 
+import { ApiKeyComponent } from "./accounts/apiKey.component";
+import { EnvironmentComponent } from "./accounts/environment.component";
+import { AppRoutingModule } from "./app-routing.module";
+import { AppComponent } from "./app.component";
+import { ServicesModule } from "./services/services.module";
+import { DashboardComponent } from "./tabs/dashboard.component";
+import { MoreComponent } from "./tabs/more.component";
+import { SettingsComponent } from "./tabs/settings.component";
+import { TabsComponent } from "./tabs/tabs.component";
+
 @NgModule({
   imports: [
     BrowserModule,

src/app/services/services.module.ts

@@ -1,25 +1,6 @@
 import { APP_INITIALIZER, Injector, NgModule } from "@angular/core";
 
-import { ElectronLogService } from "jslib-electron/services/electronLog.service";
-import { ElectronPlatformUtilsService } from "jslib-electron/services/electronPlatformUtils.service";
-import { ElectronRendererMessagingService } from "jslib-electron/services/electronRendererMessaging.service";
-import { ElectronRendererSecureStorageService } from "jslib-electron/services/electronRendererSecureStorage.service";
-import { ElectronRendererStorageService } from "jslib-electron/services/electronRendererStorage.service";
-
-import { AuthGuardService } from "./auth-guard.service";
-import { LaunchGuardService } from "./launch-guard.service";
-
-import { I18nService } from "../../services/i18n.service";
-import { NoopTwoFactorService } from "../../services/noop/noopTwoFactor.service";
-import { SyncService } from "../../services/sync.service";
-
 import { JslibServicesModule } from "jslib-angular/services/jslib-services.module";
-
-import { ContainerService } from "jslib-common/services/container.service";
-
-import { NodeApiService } from "jslib-node/services/nodeApi.service";
-import { NodeCryptoFunctionService } from "jslib-node/services/nodeCryptoFunction.service";
-
 import { ApiService as ApiServiceAbstraction } from "jslib-common/abstractions/api.service";
 import { AppIdService as AppIdServiceAbstraction } from "jslib-common/abstractions/appId.service";
 import { AuthService as AuthServiceAbstraction } from "jslib-common/abstractions/auth.service";
@@ -36,19 +17,29 @@ import { StateMigrationService as StateMigrationServiceAbstraction } from "jslib
 import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service";
 import { TokenService as TokenServiceAbstraction } from "jslib-common/abstractions/token.service";
 import { TwoFactorService as TwoFactorServiceAbstraction } from "jslib-common/abstractions/twoFactor.service";
+import { StateFactory } from "jslib-common/factories/stateFactory";
+import { GlobalState } from "jslib-common/models/domain/globalState";
+import { ContainerService } from "jslib-common/services/container.service";
+import { ElectronLogService } from "jslib-electron/services/electronLog.service";
+import { ElectronPlatformUtilsService } from "jslib-electron/services/electronPlatformUtils.service";
+import { ElectronRendererMessagingService } from "jslib-electron/services/electronRendererMessaging.service";
+import { ElectronRendererSecureStorageService } from "jslib-electron/services/electronRendererSecureStorage.service";
+import { ElectronRendererStorageService } from "jslib-electron/services/electronRendererStorage.service";
+import { NodeApiService } from "jslib-node/services/nodeApi.service";
+import { NodeCryptoFunctionService } from "jslib-node/services/nodeCryptoFunction.service";
 
 import { StateService as StateServiceAbstraction } from "../../abstractions/state.service";
-
+import { Account } from "../../models/account";
 import { refreshToken } from "../../services/api.service";
 import { AuthService } from "../../services/auth.service";
+import { I18nService } from "../../services/i18n.service";
+import { NoopTwoFactorService } from "../../services/noop/noopTwoFactor.service";
 import { StateService } from "../../services/state.service";
 import { StateMigrationService } from "../../services/stateMigration.service";
+import { SyncService } from "../../services/sync.service";
 
-import { Account } from "../../models/account";
-
-import { StateFactory } from "jslib-common/factories/stateFactory";
-
-import { GlobalState } from "jslib-common/models/domain/globalState";
+import { AuthGuardService } from "./auth-guard.service";
+import { LaunchGuardService } from "./launch-guard.service";
 
 function refreshTokenCallback(injector: Injector) {
   return () => {
@@ -64,7 +55,7 @@ export function initFactory(
   platformUtilsService: PlatformUtilsServiceAbstraction,
   stateService: StateServiceAbstraction,
   cryptoService: CryptoServiceAbstraction
-): Function {
+): () => Promise<void> {
   return async () => {
     await stateService.init();
     await environmentService.setUrlsFromStorage();

src/app/tabs/dashboard.component.ts

@@ -5,16 +5,13 @@ import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { MessagingService } from "jslib-common/abstractions/messaging.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 
-import { SyncService } from "../../services/sync.service";
-
+import { StateService } from "../../abstractions/state.service";
 import { GroupEntry } from "../../models/groupEntry";
 import { SimResult } from "../../models/simResult";
 import { UserEntry } from "../../models/userEntry";
-
+import { SyncService } from "../../services/sync.service";
 import { ConnectorUtils } from "../../utils";
 
-import { StateService } from "../../abstractions/state.service";
-
 const BroadcasterSubscriptionId = "DashboardComponent";
 
 @Component({
@@ -28,7 +25,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
   simDisabledUsers: UserEntry[] = [];
   simDeletedUsers: UserEntry[] = [];
   simPromise: Promise<SimResult>;
-  simSinceLast: boolean = false;
+  simSinceLast = false;
   syncPromise: Promise<[GroupEntry[], UserEntry[]]>;
   startPromise: Promise<any>;
   lastGroupSync: Date;

src/app/tabs/settings.component.ts

@@ -3,16 +3,14 @@ import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from "@angula
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 
+import { StateService } from "../../abstractions/state.service";
 import { DirectoryType } from "../../enums/directoryType";
-
 import { AzureConfiguration } from "../../models/azureConfiguration";
 import { GSuiteConfiguration } from "../../models/gsuiteConfiguration";
 import { LdapConfiguration } from "../../models/ldapConfiguration";
 import { OktaConfiguration } from "../../models/oktaConfiguration";
 import { OneLoginConfiguration } from "../../models/oneLoginConfiguration";
 import { SyncConfiguration } from "../../models/syncConfiguration";
-
-import { StateService } from "../../abstractions/state.service";
 import { ConnectorUtils } from "../../utils";
 
 @Component({
@@ -29,10 +27,10 @@ export class SettingsComponent implements OnInit, OnDestroy {
   oneLogin = new OneLoginConfiguration();
   sync = new SyncConfiguration();
   directoryOptions: any[];
-  showLdapPassword: boolean = false;
-  showAzureKey: boolean = false;
-  showOktaKey: boolean = false;
-  showOneLoginSecret: boolean = false;
+  showLdapPassword = false;
+  showAzureKey = false;
+  showOktaKey = false;
+  showOneLoginSecret = false;
 
   constructor(
     private i18nService: I18nService,

src/bwdc.ts

@@ -1,24 +1,13 @@
 import * as fs from "fs";
 import * as path from "path";
 
+import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service";
+import { TwoFactorService as TwoFactorServiceAbstraction } from "jslib-common/abstractions/twoFactor.service";
 import { ClientType } from "jslib-common/enums/clientType";
 import { LogLevelType } from "jslib-common/enums/logLevelType";
-
-import { AuthService } from "./services/auth.service";
-
-import { I18nService } from "./services/i18n.service";
-import { KeytarSecureStorageService } from "./services/keytarSecureStorage.service";
-import { LowdbStorageService } from "./services/lowdbStorage.service";
-import { NoopTwoFactorService } from "./services/noop/noopTwoFactor.service";
-import { StateService } from "./services/state.service";
-import { StateMigrationService } from "./services/stateMigration.service";
-import { SyncService } from "./services/sync.service";
-
-import { CliPlatformUtilsService } from "jslib-node/cli/services/cliPlatformUtils.service";
-import { ConsoleLogService } from "jslib-node/cli/services/consoleLog.service";
-import { NodeApiService } from "jslib-node/services/nodeApi.service";
-import { NodeCryptoFunctionService } from "jslib-node/services/nodeCryptoFunction.service";
-
+import { StateFactory } from "jslib-common/factories/stateFactory";
+import { GlobalState } from "jslib-common/models/domain/globalState";
+import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials";
 import { AppIdService } from "jslib-common/services/appId.service";
 import { CipherService } from "jslib-common/services/cipher.service";
 import { CollectionService } from "jslib-common/services/collection.service";
@@ -37,23 +26,26 @@ import { SearchService } from "jslib-common/services/search.service";
 import { SendService } from "jslib-common/services/send.service";
 import { SettingsService } from "jslib-common/services/settings.service";
 import { TokenService } from "jslib-common/services/token.service";
-
-import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service";
-import { TwoFactorService as TwoFactorServiceAbstraction } from "jslib-common/abstractions/twoFactor.service";
-
-import { Program } from "./program";
+import { CliPlatformUtilsService } from "jslib-node/cli/services/cliPlatformUtils.service";
+import { ConsoleLogService } from "jslib-node/cli/services/consoleLog.service";
+import { NodeApiService } from "jslib-node/services/nodeApi.service";
+import { NodeCryptoFunctionService } from "jslib-node/services/nodeCryptoFunction.service";
 
 import { Account } from "./models/account";
+import { Program } from "./program";
+import { AuthService } from "./services/auth.service";
+import { I18nService } from "./services/i18n.service";
+import { KeytarSecureStorageService } from "./services/keytarSecureStorage.service";
+import { LowdbStorageService } from "./services/lowdbStorage.service";
+import { NoopTwoFactorService } from "./services/noop/noopTwoFactor.service";
+import { StateService } from "./services/state.service";
+import { StateMigrationService } from "./services/stateMigration.service";
+import { SyncService } from "./services/sync.service";
 
-import { StateFactory } from "jslib-common/factories/stateFactory";
-
-import { GlobalState } from "jslib-common/models/domain/globalState";
-import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials";
-
-// tslint:disable-next-line
+// eslint-disable-next-line
 const packageJson = require("./package.json");
 
-export let searchService: SearchService = null;
+export const searchService: SearchService = null;
 export class Main {
   dataFilePath: string;
   logService: ConsoleLogService;

src/commands/clearCache.command.ts

@@ -1,9 +1,9 @@
 import * as program from "commander";
 
 import { I18nService } from "jslib-common/abstractions/i18n.service";
-
 import { Response } from "jslib-node/cli/models/response";
 import { MessageResponse } from "jslib-node/cli/models/response/messageResponse";
+
 import { StateService } from "../abstractions/state.service";
 
 export class ClearCacheCommand {

src/commands/config.command.ts

@@ -2,25 +2,20 @@ import * as program from "commander";
 
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
-
-import { StateService } from "../abstractions/state.service";
-
-import { DirectoryType } from "../enums/directoryType";
-
+import { NodeUtils } from "jslib-common/misc/nodeUtils";
 import { Response } from "jslib-node/cli/models/response";
 import { MessageResponse } from "jslib-node/cli/models/response/messageResponse";
 
+import { StateService } from "../abstractions/state.service";
+import { DirectoryType } from "../enums/directoryType";
 import { AzureConfiguration } from "../models/azureConfiguration";
 import { GSuiteConfiguration } from "../models/gsuiteConfiguration";
 import { LdapConfiguration } from "../models/ldapConfiguration";
 import { OktaConfiguration } from "../models/oktaConfiguration";
 import { OneLoginConfiguration } from "../models/oneLoginConfiguration";
 import { SyncConfiguration } from "../models/syncConfiguration";
-
 import { ConnectorUtils } from "../utils";
 
-import { NodeUtils } from "jslib-common/misc/nodeUtils";
-
 export class ConfigCommand {
   private directory: DirectoryType;
   private ldap = new LdapConfiguration();

src/commands/lastSync.command.ts

@@ -1,26 +1,26 @@
-import * as program from "commander";
-
-import { StateService } from "../abstractions/state.service";
-
 import { Response } from "jslib-node/cli/models/response";
 import { StringResponse } from "jslib-node/cli/models/response/stringResponse";
 
+import { StateService } from "../abstractions/state.service";
+
 export class LastSyncCommand {
   constructor(private stateService: StateService) {}
 
   async run(object: string): Promise<Response> {
     try {
       switch (object.toLowerCase()) {
-        case "groups":
+        case "groups": {
           const groupsDate = await this.stateService.getLastGroupSync();
           const groupsRes = new StringResponse(
             groupsDate == null ? null : groupsDate.toISOString()
           );
           return Response.success(groupsRes);
-        case "users":
+        }
+        case "users": {
           const usersDate = await this.stateService.getLastUserSync();
           const usersRes = new StringResponse(usersDate == null ? null : usersDate.toISOString());
           return Response.success(usersRes);
+        }
         default:
           return Response.badRequest("Unknown object.");
       }

src/commands/sync.command.ts

@@ -1,10 +1,9 @@
 import { I18nService } from "jslib-common/abstractions/i18n.service";
-
-import { SyncService } from "../services/sync.service";
-
 import { Response } from "jslib-node/cli/models/response";
 import { MessageResponse } from "jslib-node/cli/models/response/messageResponse";
 
+import { SyncService } from "../services/sync.service";
+
 export class SyncCommand {
   constructor(private syncService: SyncService, private i18nService: I18nService) {}
 

src/commands/test.command.ts

@@ -1,13 +1,11 @@
 import * as program from "commander";
 
 import { I18nService } from "jslib-common/abstractions/i18n.service";
-
-import { SyncService } from "../services/sync.service";
-
-import { ConnectorUtils } from "../utils";
-
 import { Response } from "jslib-node/cli/models/response";
+
 import { TestResponse } from "../models/response/testResponse";
+import { SyncService } from "../services/sync.service";
+import { ConnectorUtils } from "../utils";
 
 export class TestCommand {
   constructor(private syncService: SyncService, private i18nService: I18nService) {}

src/main.ts

@@ -1,10 +1,9 @@
-import { app } from "electron";
 import * as path from "path";
 
-import { MenuMain } from "./main/menu.main";
-import { MessagingMain } from "./main/messaging.main";
-import { I18nService } from "./services/i18n.service";
+import { app } from "electron";
 
+import { StateFactory } from "jslib-common/factories/stateFactory";
+import { GlobalState } from "jslib-common/models/domain/globalState";
 import { KeytarStorageListener } from "jslib-electron/keytarStorageListener";
 import { ElectronLogService } from "jslib-electron/services/electronLog.service";
 import { ElectronMainMessagingService } from "jslib-electron/services/electronMainMessaging.service";
@@ -13,13 +12,11 @@ import { TrayMain } from "jslib-electron/tray.main";
 import { UpdaterMain } from "jslib-electron/updater.main";
 import { WindowMain } from "jslib-electron/window.main";
 
-import { StateService } from "./services/state.service";
-
+import { MenuMain } from "./main/menu.main";
+import { MessagingMain } from "./main/messaging.main";
 import { Account } from "./models/account";
-
-import { StateFactory } from "jslib-common/factories/stateFactory";
-
-import { GlobalState } from "jslib-common/models/domain/globalState";
+import { I18nService } from "./services/i18n.service";
+import { StateService } from "./services/state.service";
 
 export class Main {
   logService: ElectronLogService;
@@ -53,7 +50,7 @@ export class Main {
     const watch = args.some((val) => val === "--watch");
 
     if (watch) {
-      // tslint:disable-next-line
+      // eslint-disable-next-line
       require("electron-reload")(__dirname, {});
     }
 
@@ -132,7 +129,7 @@ export class Main {
         });
       },
       (e: any) => {
-        // tslint:disable-next-line
+        // eslint-disable-next-line
         console.error(e);
       }
     );

src/main/menu.main.ts

@@ -1,9 +1,9 @@
-import { Menu, MenuItem, MenuItemConstructorOptions } from "electron";
-
-import { Main } from "../main";
+import { Menu, MenuItemConstructorOptions } from "electron";
 
 import { BaseMenu } from "jslib-electron/baseMenu";
 
+import { Main } from "../main";
+
 export class MenuMain extends BaseMenu {
   menu: Menu;
 

src/main/messaging.main.ts

@@ -1,4 +1,4 @@
-import { app, ipcMain } from "electron";
+import { ipcMain } from "electron";
 
 import { TrayMain } from "jslib-electron/tray.main";
 import { UpdaterMain } from "jslib-electron/updater.main";

src/misc/logInStrategies/organizationLogIn.strategy.ts

@@ -1,12 +1,9 @@
 import { LogInStrategy } from "jslib-common/misc/logInStrategies/logIn.strategy";
-
-import { ApiTokenRequest } from "jslib-common/models/request/identityToken/apiTokenRequest";
-
-import { IdentityTokenResponse } from "jslib-common/models/response/identityTokenResponse";
-
 import { AccountKeys, AccountProfile, AccountTokens } from "jslib-common/models/domain/account";
 import { AuthResult } from "jslib-common/models/domain/authResult";
 import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials";
+import { ApiTokenRequest } from "jslib-common/models/request/identityToken/apiTokenRequest";
+import { IdentityTokenResponse } from "jslib-common/models/response/identityTokenResponse";
 
 import { Account, DirectoryConfigurations, DirectorySettings } from "src/models/account";
 

src/models/IConfiguration.ts

@@ -1,2 +1,2 @@
-// tslint:disable-next-line
+// eslint-disable-next-line
 export interface IConfiguration {}

src/models/response/testResponse.ts

@@ -1,9 +1,9 @@
-import { GroupResponse } from "./groupResponse";
-import { UserResponse } from "./userResponse";
+import { BaseResponse } from "jslib-node/cli/models/response/baseResponse";
 
 import { SimResult } from "../simResult";
 
-import { BaseResponse } from "jslib-node/cli/models/response/baseResponse";
+import { GroupResponse } from "./groupResponse";
+import { UserResponse } from "./userResponse";
 
 export class TestResponse implements BaseResponse {
   object: string;

src/program.ts

@@ -1,27 +1,24 @@
-import * as chalk from "chalk";
-import * as program from "commander";
 import * as path from "path";
 
-import { Main } from "./bwdc";
+import * as chalk from "chalk";
+import * as program from "commander";
 
+import { Utils } from "jslib-common/misc/utils";
+import { BaseProgram } from "jslib-node/cli/baseProgram";
+import { LoginCommand } from "jslib-node/cli/commands/login.command";
+import { LogoutCommand } from "jslib-node/cli/commands/logout.command";
+import { UpdateCommand } from "jslib-node/cli/commands/update.command";
+import { Response } from "jslib-node/cli/models/response";
+import { StringResponse } from "jslib-node/cli/models/response/stringResponse";
+
+import { Main } from "./bwdc";
 import { ClearCacheCommand } from "./commands/clearCache.command";
 import { ConfigCommand } from "./commands/config.command";
 import { LastSyncCommand } from "./commands/lastSync.command";
 import { SyncCommand } from "./commands/sync.command";
 import { TestCommand } from "./commands/test.command";
 
-import { LoginCommand } from "jslib-node/cli/commands/login.command";
-import { LogoutCommand } from "jslib-node/cli/commands/logout.command";
-import { UpdateCommand } from "jslib-node/cli/commands/update.command";
-
-import { BaseProgram } from "jslib-node/cli/baseProgram";
-
-import { Response } from "jslib-node/cli/models/response";
-import { StringResponse } from "jslib-node/cli/models/response/stringResponse";
-
-import { Utils } from "jslib-common/misc/utils";
-
-const writeLn = (s: string, finalLine: boolean = false, error: boolean = false) => {
+const writeLn = (s: string, finalLine = false, error = false) => {
   const stream = error ? process.stderr : process.stdout;
   if (finalLine && process.platform === "win32") {
     stream.write(s);

src/services/api.service.ts

@@ -2,11 +2,11 @@ import { AuthService } from "jslib-common/abstractions/auth.service";
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { TokenService } from "jslib-common/abstractions/token.service";
-import { StateService } from "../abstractions/state.service";
-
 import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials";
 import { ApiService as ApiServiceBase } from "jslib-common/services/api.service";
 
+import { StateService } from "../abstractions/state.service";
+
 export async function refreshToken(stateService: StateService, authService: AuthService) {
   try {
     const clientId = await stateService.getApiKeyClientId();

src/services/auth.service.ts

@@ -1,5 +1,3 @@
-import { OrganizationLogInStrategy } from "../misc/logInStrategies/organizationLogIn.strategy";
-
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { AppIdService } from "jslib-common/abstractions/appId.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
@@ -11,13 +9,12 @@ import { MessagingService } from "jslib-common/abstractions/messaging.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { TokenService } from "jslib-common/abstractions/token.service";
 import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service";
-
-import { AuthService as AuthServiceBase } from "jslib-common/services/auth.service";
-
 import { AuthResult } from "jslib-common/models/domain/authResult";
 import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials";
+import { AuthService as AuthServiceBase } from "jslib-common/services/auth.service";
 
 import { StateService } from "../abstractions/state.service";
+import { OrganizationLogInStrategy } from "../misc/logInStrategies/organizationLogIn.strategy";
 
 export class AuthService extends AuthServiceBase {
   constructor(

src/services/azure-directory.service.ts

@@ -1,10 +1,14 @@
-import * as graph from "@microsoft/microsoft-graph-client";
-import * as graphType from "@microsoft/microsoft-graph-types";
 import * as https from "https";
 import * as querystring from "querystring";
 
-import { DirectoryType } from "../enums/directoryType";
+import * as graph from "@microsoft/microsoft-graph-client";
+import * as graphType from "@microsoft/microsoft-graph-types";
 
+import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { LogService } from "jslib-common/abstractions/log.service";
+
+import { StateService } from "../abstractions/state.service";
+import { DirectoryType } from "../enums/directoryType";
 import { AzureConfiguration } from "../models/azureConfiguration";
 import { GroupEntry } from "../models/groupEntry";
 import { SyncConfiguration } from "../models/syncConfiguration";
@@ -13,10 +17,6 @@ import { UserEntry } from "../models/userEntry";
 import { BaseDirectoryService } from "./baseDirectory.service";
 import { IDirectoryService } from "./directory.service";
 
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { StateService } from "../abstractions/state.service";
-
 const AzurePublicIdentityAuhtority = "login.microsoftonline.com";
 const AzureGovermentIdentityAuhtority = "login.microsoftonline.us";
 
@@ -84,7 +84,6 @@ export class AzureDirectoryService extends BaseDirectoryService implements IDire
   }
 
   private async getCurrentUsers(): Promise<UserEntry[]> {
-    const entryIds = new Set<string>();
     let entries: UserEntry[] = [];
     let users: graphType.User[];
     const setFilter = this.createCustomUserSet(this.syncConfig.userFilter);
@@ -131,6 +130,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements IDire
     }
 
     const setFilter = this.createCustomUserSet(this.syncConfig.userFilter);
+    // eslint-disable-next-line
     while (true) {
       const users: graphType.User[] = res.value;
       if (users != null) {
@@ -312,6 +312,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements IDire
     const entries: GroupEntry[] = [];
     const groupsReq = this.client.api("/groups");
     let res = await groupsReq.get();
+    // eslint-disable-next-line
     while (true) {
       const groups: graphType.Group[] = res.value;
       if (groups != null) {
@@ -404,6 +405,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements IDire
 
     const memReq = this.client.api("/groups/" + group.id + "/members");
     let memRes = await memReq.get();
+    // eslint-disable-next-line
     while (true) {
       const members: any = memRes.value;
       if (members != null) {
@@ -486,7 +488,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements IDire
                 } else if (d.error != null && d.error_description != null) {
                   const shortError = d.error_description?.split("\n", 1)[0];
                   const err = new Error(d.error + " (" + res.statusCode + "): " + shortError);
-                  // tslint:disable-next-line
+                  // eslint-disable-next-line
                   console.error(d.error_description);
                   done(err, null);
                 } else {

src/services/baseDirectory.service.ts

@@ -1,6 +1,5 @@
-import { SyncConfiguration } from "../models/syncConfiguration";
-
 import { GroupEntry } from "../models/groupEntry";
+import { SyncConfiguration } from "../models/syncConfiguration";
 import { UserEntry } from "../models/userEntry";
 
 export abstract class BaseDirectoryService {

src/services/gsuite-directory.service.ts

@@ -1,8 +1,11 @@
 import { JWT } from "google-auth-library";
 import { admin_directory_v1, google } from "googleapis";
 
-import { DirectoryType } from "../enums/directoryType";
+import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { LogService } from "jslib-common/abstractions/log.service";
 
+import { StateService } from "../abstractions/state.service";
+import { DirectoryType } from "../enums/directoryType";
 import { GroupEntry } from "../models/groupEntry";
 import { GSuiteConfiguration } from "../models/gsuiteConfiguration";
 import { SyncConfiguration } from "../models/syncConfiguration";
@@ -11,10 +14,6 @@ import { UserEntry } from "../models/userEntry";
 import { BaseDirectoryService } from "./baseDirectory.service";
 import { IDirectoryService } from "./directory.service";
 
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { StateService } from "../abstractions/state.service";
-
 export class GSuiteDirectoryService extends BaseDirectoryService implements IDirectoryService {
   private client: JWT;
   private service: admin_directory_v1.Admin;
@@ -72,6 +71,7 @@ export class GSuiteDirectoryService extends BaseDirectoryService implements IDir
     let nextPageToken: string = null;
 
     const filter = this.createCustomSet(this.syncConfig.userFilter);
+    // eslint-disable-next-line
     while (true) {
       this.logService.info("Querying users - nextPageToken:" + nextPageToken);
       const p = Object.assign({ query: query, pageToken: nextPageToken }, this.authParams);
@@ -99,6 +99,7 @@ export class GSuiteDirectoryService extends BaseDirectoryService implements IDir
     }
 
     nextPageToken = null;
+    // eslint-disable-next-line
     while (true) {
       this.logService.info("Querying deleted users - nextPageToken:" + nextPageToken);
       const p = Object.assign(
@@ -152,6 +153,7 @@ export class GSuiteDirectoryService extends BaseDirectoryService implements IDir
     const entries: GroupEntry[] = [];
     let nextPageToken: string = null;
 
+    // eslint-disable-next-line
     while (true) {
       this.logService.info("Querying groups - nextPageToken:" + nextPageToken);
       const p = Object.assign({ pageToken: nextPageToken }, this.authParams);
@@ -186,6 +188,7 @@ export class GSuiteDirectoryService extends BaseDirectoryService implements IDir
     entry.externalId = group.id;
     entry.name = group.name;
 
+    // eslint-disable-next-line
     while (true) {
       const p = Object.assign({ groupKey: group.id, pageToken: nextPageToken }, this.authParams);
       const memRes = await this.service.members.list(p);

src/services/ldap-directory.service.ts

@@ -1,10 +1,14 @@
 import * as fs from "fs";
-import * as ldap from "ldapjs";
-
 import { checkServerIdentity, PeerCertificate } from "tls";
 
-import { DirectoryType } from "../enums/directoryType";
+import * as ldap from "ldapjs";
 
+import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { LogService } from "jslib-common/abstractions/log.service";
+import { Utils } from "jslib-common/misc/utils";
+
+import { StateService } from "../abstractions/state.service";
+import { DirectoryType } from "../enums/directoryType";
 import { GroupEntry } from "../models/groupEntry";
 import { LdapConfiguration } from "../models/ldapConfiguration";
 import { SyncConfiguration } from "../models/syncConfiguration";
@@ -12,12 +16,6 @@ import { UserEntry } from "../models/userEntry";
 
 import { IDirectoryService } from "./directory.service";
 
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { StateService } from "../abstractions/state.service";
-
-import { Utils } from "jslib-common/misc/utils";
-
 const UserControlAccountDisabled = 2;
 
 export class LdapDirectoryService implements IDirectoryService {

src/services/lowdbStorage.service.ts

@@ -1,10 +1,8 @@
 import * as lock from "proper-lockfile";
 
 import { LogService } from "jslib-common/abstractions/log.service";
-
-import { LowdbStorageService as LowdbStorageServiceBase } from "jslib-node/services/lowdbStorage.service";
-
 import { Utils } from "jslib-common/misc/utils";
+import { LowdbStorageService as LowdbStorageServiceBase } from "jslib-node/services/lowdbStorage.service";
 
 export class LowdbStorageService extends LowdbStorageServiceBase {
   constructor(

src/services/noop/noopTwoFactor.service.ts

@@ -2,9 +2,7 @@ import {
   TwoFactorProviderDetails,
   TwoFactorService,
 } from "jslib-common/abstractions/twoFactor.service";
-
 import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
-
 import { IdentityTwoFactorResponse } from "jslib-common/models/response/identityTwoFactorResponse";
 
 export class NoopTwoFactorService implements TwoFactorService {

src/services/okta-directory.service.ts

@@ -1,5 +1,10 @@
-import { DirectoryType } from "../enums/directoryType";
+import * as https from "https";
 
+import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { LogService } from "jslib-common/abstractions/log.service";
+
+import { StateService } from "../abstractions/state.service";
+import { DirectoryType } from "../enums/directoryType";
 import { GroupEntry } from "../models/groupEntry";
 import { OktaConfiguration } from "../models/oktaConfiguration";
 import { SyncConfiguration } from "../models/syncConfiguration";
@@ -8,12 +13,6 @@ import { UserEntry } from "../models/userEntry";
 import { BaseDirectoryService } from "./baseDirectory.service";
 import { IDirectoryService } from "./directory.service";
 
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-
-import * as https from "https";
-import { StateService } from "../abstractions/state.service";
-
 const DelayBetweenBuildGroupCallsInMilliseconds = 500;
 
 export class OktaDirectoryService extends BaseDirectoryService implements IDirectoryService {
@@ -213,6 +212,7 @@ export class OktaDirectoryService extends BaseDirectoryService implements IDirec
             if (res.headers != null) {
               const headersMap = new Map<string, string | string[]>();
               for (const key in res.headers) {
+                // eslint-disable-next-line
                 if (res.headers.hasOwnProperty(key)) {
                   const val = res.headers[key];
                   headersMap.set(key.toLowerCase(), val);

src/services/onelogin-directory.service.ts

@@ -1,5 +1,8 @@
-import { DirectoryType } from "../enums/directoryType";
+import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { LogService } from "jslib-common/abstractions/log.service";
 
+import { StateService } from "../abstractions/state.service";
+import { DirectoryType } from "../enums/directoryType";
 import { GroupEntry } from "../models/groupEntry";
 import { OneLoginConfiguration } from "../models/oneLoginConfiguration";
 import { SyncConfiguration } from "../models/syncConfiguration";
@@ -8,10 +11,6 @@ import { UserEntry } from "../models/userEntry";
 import { BaseDirectoryService } from "./baseDirectory.service";
 import { IDirectoryService } from "./directory.service";
 
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { StateService } from "../abstractions/state.service";
-
 // Basic email validation: something@something.something
 const ValidEmailRegex = /^\S+@\S+\.\S+$/;
 

src/services/state.service.ts

@@ -1,27 +1,22 @@
-import { StateService as BaseStateService } from "jslib-common/services/state.service";
-
+import { LogService } from "jslib-common/abstractions/log.service";
+import { StateMigrationService } from "jslib-common/abstractions/stateMigration.service";
+import { StorageService } from "jslib-common/abstractions/storage.service";
+import { StateFactory } from "jslib-common/factories/stateFactory";
 import { GlobalState } from "jslib-common/models/domain/globalState";
 import { StorageOptions } from "jslib-common/models/domain/storageOptions";
+import { StateService as BaseStateService } from "jslib-common/services/state.service";
 
-import { StateFactory } from "jslib-common/factories/stateFactory";
-
+import { StateService as StateServiceAbstraction } from "src/abstractions/state.service";
+import { DirectoryType } from "src/enums/directoryType";
+import { IConfiguration } from "src/models/IConfiguration";
 import { Account } from "src/models/account";
 import { AzureConfiguration } from "src/models/azureConfiguration";
 import { GSuiteConfiguration } from "src/models/gsuiteConfiguration";
-import { IConfiguration } from "src/models/IConfiguration";
 import { LdapConfiguration } from "src/models/ldapConfiguration";
 import { OktaConfiguration } from "src/models/oktaConfiguration";
 import { OneLoginConfiguration } from "src/models/oneLoginConfiguration";
 import { SyncConfiguration } from "src/models/syncConfiguration";
 
-import { LogService } from "jslib-common/abstractions/log.service";
-import { StateMigrationService } from "jslib-common/abstractions/stateMigration.service";
-import { StorageService } from "jslib-common/abstractions/storage.service";
-
-import { StateService as StateServiceAbstraction } from "src/abstractions/state.service";
-
-import { DirectoryType } from "src/enums/directoryType";
-
 const SecureStorageKeys = {
   ldap: "ldapPassword",
   gsuite: "gsuitePrivateKey",

src/services/stateMigration.service.ts

@@ -1,9 +1,7 @@
+import { StateVersion } from "jslib-common/enums/stateVersion";
 import { StateMigrationService as BaseStateMigrationService } from "jslib-common/services/stateMigration.service";
 
-import { StateVersion } from "jslib-common/enums/stateVersion";
-
 import { DirectoryType } from "src/enums/directoryType";
-
 import { Account, DirectoryConfigurations, DirectorySettings } from "src/models/account";
 import { AzureConfiguration } from "src/models/azureConfiguration";
 import { GSuiteConfiguration } from "src/models/gsuiteConfiguration";
@@ -76,7 +74,7 @@ export class StateMigrationService extends BaseStateMigrationService {
     }
   }
 
-  protected async migrateStateFrom1To2(useSecureStorageForSecrets: boolean = true): Promise<void> {
+  protected async migrateStateFrom1To2(useSecureStorageForSecrets = true): Promise<void> {
     // Grabbing a couple of key settings before they get cleared by the base migration
     const userId = await this.get<string>(Keys.entityId);
     const clientId = await this.get<string>(ClientKeys.clientId);

src/services/sync.service.ts

@@ -1,21 +1,18 @@
-import { DirectoryType } from "../enums/directoryType";
-
-import { GroupEntry } from "../models/groupEntry";
-import { SyncConfiguration } from "../models/syncConfiguration";
-import { UserEntry } from "../models/userEntry";
-
-import { OrganizationImportRequest } from "jslib-common/models/request/organizationImportRequest";
-
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service";
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { MessagingService } from "jslib-common/abstractions/messaging.service";
-
 import { Utils } from "jslib-common/misc/utils";
+import { OrganizationImportRequest } from "jslib-common/models/request/organizationImportRequest";
 
 import { StateService } from "../abstractions/state.service";
+import { DirectoryType } from "../enums/directoryType";
+import { GroupEntry } from "../models/groupEntry";
+import { SyncConfiguration } from "../models/syncConfiguration";
+import { UserEntry } from "../models/userEntry";
+
 import { AzureDirectoryService } from "./azure-directory.service";
 import { IDirectoryService } from "./directory.service";
 import { GSuiteDirectoryService } from "./gsuite-directory.service";
@@ -223,7 +220,7 @@ export class SyncService {
     users: UserEntry[],
     removeDisabled: boolean,
     overwriteExisting: boolean,
-    largeImport: boolean = false
+    largeImport = false
   ) {
     return new OrganizationImportRequest({
       groups: (groups ?? []).map((g) => {

src/utils.ts

@@ -1,12 +1,11 @@
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 
-import { SyncService } from "./services/sync.service";
-
 import { Entry } from "./models/entry";
 import { LdapConfiguration } from "./models/ldapConfiguration";
 import { SimResult } from "./models/simResult";
 import { SyncConfiguration } from "./models/syncConfiguration";
 import { UserEntry } from "./models/userEntry";
+import { SyncService } from "./services/sync.service";
 
 export class ConnectorUtils {
   static async simulate(
@@ -14,6 +13,7 @@ export class ConnectorUtils {
     i18nService: I18nService,
     sinceLast: boolean
   ): Promise<SimResult> {
+    // eslint-disable-next-line
     return new Promise(async (resolve, reject) => {
       const simResult = new SimResult();
       try {

tslint.json

@@ -1,67 +0,0 @@
-{
-  "extends": "tslint:recommended",
-  "rules": {
-    "align": [true, "statements", "members"],
-    "ban-types": {
-      "options": [
-        ["Object", "Avoid using the `Object` type. Did you mean `object`?"],
-        ["Boolean", "Avoid using the `Boolean` type. Did you mean `boolean`?"],
-        ["Number", "Avoid using the `Number` type. Did you mean `number`?"],
-        ["String", "Avoid using the `String` type. Did you mean `string`?"],
-        ["Symbol", "Avoid using the `Symbol` type. Did you mean `symbol`?"]
-      ]
-    },
-    "member-access": [true, "no-public"],
-    "member-ordering": [
-      true,
-      {
-        "order": [
-          "public-static-field",
-          "public-static-method",
-          "protected-static-field",
-          "protected-static-method",
-          "private-static-field",
-          "private-static-method",
-          "public-instance-field",
-          "protected-instance-field",
-          "private-instance-field",
-          "public-constructor",
-          "protected-constructor",
-          "private-constructor",
-          "public-instance-method",
-          "protected-instance-method",
-          "private-instance-method"
-        ]
-      }
-    ],
-    "no-empty": [true],
-    "object-literal-sort-keys": false,
-    "object-literal-shorthand": [true, "never"],
-    "prefer-for-of": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-module",
-      "check-operator",
-      "check-preblock",
-      "check-separator",
-      "check-type"
-    ],
-    "max-classes-per-file": false,
-    "ordered-imports": true,
-    "arrow-parens": [true],
-    "trailing-comma": [
-      true,
-      {
-        "multiline": {
-          "objects": "always",
-          "arrays": "always",
-          "functions": "ignore",
-          "typeLiterals": "ignore"
-        },
-        "singleline": "never"
-      }
-    ]
-  }
-}

webpack.cli.js

@@ -1,9 +1,10 @@
 const path = require("path");
-const webpack = require("webpack");
+
 const { CleanWebpackPlugin } = require("clean-webpack-plugin");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
-const nodeExternals = require("webpack-node-externals");
 const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
+const webpack = require("webpack");
+const nodeExternals = require("webpack-node-externals");
 
 if (process.env.NODE_ENV == null) {
   process.env.NODE_ENV = "development";
@@ -11,11 +12,6 @@ if (process.env.NODE_ENV == null) {
 const ENV = (process.env.ENV = process.env.NODE_ENV);
 
 const moduleRules = [
-  {
-    test: /\.ts$/,
-    enforce: "pre",
-    loader: "tslint-loader",
-  },
   {
     test: /\.ts$/,
     use: "ts-loader",

webpack.main.js

@@ -8,11 +8,6 @@ const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
 const common = {
   module: {
     rules: [
-      {
-        test: /\.ts$/,
-        enforce: "pre",
-        loader: "tslint-loader",
-      },
       {
         test: /\.tsx?$/,
         use: "ts-loader",

webpack.renderer.js

@@ -9,11 +9,6 @@ const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
 const common = {
   module: {
     rules: [
-      {
-        test: /\.ts$/,
-        enforce: "pre",
-        loader: "tslint-loader",
-      },
       {
         test: /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/,
         loader: "@ngtools/webpack",