From 3caae051141679b741623e0fde68e6a08deaff26 Mon Sep 17 00:00:00 2001 From: Max Leiter Date: Tue, 21 Jun 2022 22:28:08 -0700 Subject: [PATCH] server/command-line: remove most instances of require --- server/command-line/uninstall.ts | 10 ++++------ server/command-line/upgrade.ts | 9 ++++----- server/command-line/users/add.ts | 3 +-- server/command-line/users/edit.ts | 3 +-- server/command-line/users/list.ts | 4 ++-- server/command-line/users/remove.ts | 3 +-- server/command-line/users/reset.ts | 5 ++--- 7 files changed, 15 insertions(+), 22 deletions(-) diff --git a/server/command-line/uninstall.ts b/server/command-line/uninstall.ts index 8f3988ff..c2f6ad7c 100644 --- a/server/command-line/uninstall.ts +++ b/server/command-line/uninstall.ts @@ -1,7 +1,10 @@ -import log from "../log"; import colors from "chalk"; +import fs from "fs/promises"; +import path from "path"; import {Command} from "commander"; + import Config from "../config"; +import log from "../log"; import Utils from "./utils"; const program = new Command("uninstall"); @@ -10,11 +13,6 @@ program .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")); diff --git a/server/command-line/upgrade.ts b/server/command-line/upgrade.ts index fafdcfb5..af719619 100644 --- a/server/command-line/upgrade.ts +++ b/server/command-line/upgrade.ts @@ -1,8 +1,10 @@ -/* 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 Config from "../config"; +import log from "../log"; import Utils from "./utils"; const program = new Command("upgrade"); @@ -11,9 +13,6 @@ program .description("Upgrade installed themes and packages to their latest versions") .on("--help", Utils.extraHelp) .action(function (packages) { - const fs = require("fs"); - const path = require("path"); - // Get paths to the location of packages directory const packagesConfig = path.join(Config.getPackagesPath(), "package.json"); const packagesList = JSON.parse(fs.readFileSync(packagesConfig, "utf-8")).dependencies; diff --git a/server/command-line/users/add.ts b/server/command-line/users/add.ts index f1d64a07..3243f5c7 100644 --- a/server/command-line/users/add.ts +++ b/server/command-line/users/add.ts @@ -5,6 +5,7 @@ import fs from "fs"; import Helper from "../../helper"; import Config from "../../config"; import Utils from "../utils"; +import ClientManager from "../../clientManager"; const program = new Command("add"); program @@ -19,8 +20,6 @@ program return; } - // eslint-disable-next-line @typescript-eslint/no-var-requires - const ClientManager = require("../../clientManager").default; const manager = new ClientManager(); const users = manager.getUsers(); diff --git a/server/command-line/users/edit.ts b/server/command-line/users/edit.ts index 5568a9a4..38565c5c 100644 --- a/server/command-line/users/edit.ts +++ b/server/command-line/users/edit.ts @@ -5,6 +5,7 @@ import colors from "chalk"; import fs from "fs"; import Config from "../../config"; import Utils from "../utils"; +import ClientManager from "../../clientManager"; const program = new Command("edit"); program @@ -17,8 +18,6 @@ program return; } - // eslint-disable-next-line @typescript-eslint/no-var-requires - const ClientManager = require("../../clientManager").default; const users = new ClientManager().getUsers(); if (users === undefined) { diff --git a/server/command-line/users/list.ts b/server/command-line/users/list.ts index 4389f9bc..6a03e6aa 100644 --- a/server/command-line/users/list.ts +++ b/server/command-line/users/list.ts @@ -2,13 +2,13 @@ import log from "../../log"; import colors from "chalk"; import {Command} from "commander"; import Utils from "../utils"; +import ClientManager from "../../clientManager"; const program = new Command("list"); program .description("List all users") .on("--help", Utils.extraHelp) - .action(async function () { - const ClientManager = (await import("../../clientManager")).default; + .action(function () { const users = new ClientManager().getUsers(); if (users === undefined) { diff --git a/server/command-line/users/remove.ts b/server/command-line/users/remove.ts index 2416cd4b..aa162d20 100644 --- a/server/command-line/users/remove.ts +++ b/server/command-line/users/remove.ts @@ -4,6 +4,7 @@ import {Command} from "commander"; import fs from "fs"; import Config from "../../config"; import Utils from "../utils"; +import ClientManager from "../../clientManager"; const program = new Command("remove"); program @@ -16,8 +17,6 @@ program return; } - // eslint-disable-next-line @typescript-eslint/no-var-requires - const ClientManager = require("../../clientManager").default; const manager = new ClientManager(); try { diff --git a/server/command-line/users/reset.ts b/server/command-line/users/reset.ts index 4476bb0d..50969313 100644 --- a/server/command-line/users/reset.ts +++ b/server/command-line/users/reset.ts @@ -5,6 +5,7 @@ import fs from "fs"; import Helper from "../../helper"; import Config from "../../config"; import Utils from "../utils"; +import ClientManager from "../../clientManager"; const program = new Command("reset"); program @@ -18,8 +19,6 @@ program return; } - // eslint-disable-next-line @typescript-eslint/no-var-requires - const ClientManager = require("../../clientManager").default; const users = new ClientManager().getUsers(); if (users === undefined) { @@ -52,7 +51,7 @@ program ); }); -function change(name, password) { +function change(name: string, password: string) { const pathReal = Config.getUserConfigPath(name); const pathTemp = pathReal + ".tmp"; const user = JSON.parse(fs.readFileSync(pathReal, "utf-8"));