diff --git a/src/data/GuildCases.ts b/src/data/GuildCases.ts index f8ef564e..430ebde8 100644 --- a/src/data/GuildCases.ts +++ b/src/data/GuildCases.ts @@ -1,4 +1,4 @@ -import * as knex from "../knex"; +import knex from "../knex"; import Case from "../models/Case"; export class GuildCases { diff --git a/src/data/GuildMutes.ts b/src/data/GuildMutes.ts index e167b819..50c49800 100644 --- a/src/data/GuildMutes.ts +++ b/src/data/GuildMutes.ts @@ -1,5 +1,5 @@ -import * as knex from "../knex"; -import * as moment from "moment-timezone"; +import knex from "../knex"; +import moment from "moment-timezone"; import Mute from "../models/Mute"; export class GuildMutes { diff --git a/src/data/GuildServerLogs.ts b/src/data/GuildServerLogs.ts index e9b50775..4f508c48 100644 --- a/src/data/GuildServerLogs.ts +++ b/src/data/GuildServerLogs.ts @@ -1,4 +1,4 @@ -import * as EventEmitter from "events"; +import EventEmitter from "events"; import { LogType } from "./LogType"; // Use the same instance for the same guild, even if a new instance is created diff --git a/src/knex.ts b/src/knex.ts index 580049af..41a2e820 100644 --- a/src/knex.ts +++ b/src/knex.ts @@ -1,5 +1,5 @@ const knexfile = require("../knexfile"); -import * as knex from "knex"; +import knex from "knex"; const db = knex(knexfile); diff --git a/src/plugins/BotControl.ts b/src/plugins/BotControl.ts index d2a2e1d8..87bf83e7 100644 --- a/src/plugins/BotControl.ts +++ b/src/plugins/BotControl.ts @@ -1,5 +1,5 @@ import { decorators as d, GlobalPlugin } from "knub"; -import * as child_process from "child_process"; +import child_process from "child_process"; import { Message } from "eris"; /** diff --git a/src/plugins/Logs.ts b/src/plugins/Logs.ts index f922f2db..a46ac3cc 100644 --- a/src/plugins/Logs.ts +++ b/src/plugins/Logs.ts @@ -3,7 +3,7 @@ import { GuildServerLogs } from "../data/GuildServerLogs"; import { LogType } from "../data/LogType"; import { TextChannel } from "eris"; import { formatTemplateString } from "../utils"; -import * as moment from "moment-timezone"; +import moment from "moment-timezone"; interface ILogChannel { include?: LogType[]; diff --git a/src/plugins/ModActions.ts b/src/plugins/ModActions.ts index 06957aa1..5190e163 100644 --- a/src/plugins/ModActions.ts +++ b/src/plugins/ModActions.ts @@ -1,7 +1,7 @@ import { Plugin, decorators as d, waitForReaction } from "knub"; import { Guild, GuildAuditLogEntry, Member, Message, TextChannel, User } from "eris"; -import * as moment from "moment-timezone"; -import * as humanizeDuration from "humanize-duration"; +import moment from "moment-timezone"; +import humanizeDuration from "humanize-duration"; import { GuildCases } from "../data/GuildCases"; import { convertDelayStringToMS, diff --git a/tsconfig.json b/tsconfig.json index 2d4f1232..4449f0a2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "moduleResolution": "node", "module": "commonjs", "noImplicitAny": false, "allowSyntheticDefaultImports": true, @@ -10,6 +11,8 @@ "es7", "ES2017" ], - "baseUrl": "./" + "baseUrl": "./", + "resolveJsonModule": true, + "esModuleInterop": true } }