refactor: switch es module resolution method

ChatSift · Nov 2, 2023 · b431ecf · b431ecf
1 parent dfaf25f
commit b431ecf
Show file tree

Hide file tree

Showing 53 changed files with 118 additions and 134 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -14,7 +14,6 @@
 		"curly": ["error", "all"],
 		"eqeqeq": ["error", "always", { "null": "ignore" }],
 		"no-eq-null": "off",
-		"@typescript-eslint/consistent-type-definitions": ["error", "interface"],
-		"import/extensions": ["error", { ".js": "always" }]
+		"@typescript-eslint/consistent-type-definitions": ["error", "interface"]
 	}
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -31,14 +31,7 @@ services:
       - ./logs:/usr/modmail/logs
     depends_on:
       - postgres
-    command:
-      [
-        'node',
-        '--es-module-specifier-resolution=node',
-        '--enable-source-maps',
-        '--no-warnings',
-        './packages/bot/dist/index.js',
-      ]
+    command: ['node', '--enable-source-maps', '--no-warnings', './packages/bot/dist/index.js']
 
 volumes:
   postgres-data:

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
 		"@typescript-eslint/parser": "^6.9.1",
 		"dotenv-cli": "^7.3.0",
 		"eslint": "^8.52.0",
-		"eslint-config-neon": "0.1.56",
+		"eslint-config-neon": "0.1.54",
 		"husky": "^8.0.3",
 		"is-ci": "^3.0.1",
 		"prettier": "^3.0.3",

diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
@@ -12,8 +12,8 @@ import helmet from 'helmet';
 import type { Middleware } from 'polka';
 import polka from 'polka';
 import { container } from 'tsyringe';
-import { Env } from './util/env';
-import { logger } from './util/logger';
+import { Env } from './util/env.js';
+import { logger } from './util/logger.js';
 
 const env = container.resolve(Env);
 container.register(PrismaClient, { useValue: new PrismaClient() });
@@ -57,4 +57,4 @@ for await (const file of files) {
 
 app.listen(env.port, () => logger.info(`Listening to requests on port ${env.port}`));
 
-export * from './routeTypes';
+export * from './routeTypes.js';
diff --git a/packages/api/src/routeTypes.ts b/packages/api/src/routeTypes.ts
@@ -46,4 +46,4 @@ export type InferModmailRouteResult<
 	TMethod extends keyof ModmailRoutes[TPath],
 > = InferRouteResult<ModmailRoutes[TPath][TMethod]>;
 
-export * from './util/models';
+export * from './util/models.js';
diff --git a/packages/api/src/routes/createSnippet.ts b/packages/api/src/routes/createSnippet.ts
@@ -12,9 +12,9 @@ import type {
 import { ApplicationCommandOptionType, Routes } from 'discord-api-types/v10';
 import type { NextHandler, Response } from 'polka';
 import { singleton } from 'tsyringe';
-import { Env } from '../util/env';
+import { Env } from '../util/env.js';
 import type { Snippet } from '../util/models';
-import { snowflakeSchema } from '../util/snowflakeSchema';
+import { snowflakeSchema } from '../util/snowflakeSchema.js';
 
 const schema = s.object({
 	name: s.string.lengthGreaterThan(0).lengthLessThanOrEqual(32),

diff --git a/packages/api/src/routes/deleteSnippet.ts b/packages/api/src/routes/deleteSnippet.ts
@@ -8,9 +8,9 @@ import { s } from '@sapphire/shapeshift';
 import { Routes } from 'discord-api-types/v10';
 import type { NextHandler, Request, Response } from 'polka';
 import { singleton } from 'tsyringe';
-import { Env } from '../util/env';
+import { Env } from '../util/env.js';
 import type { Snippet } from '../util/models';
-import { snowflakeSchema } from '../util/snowflakeSchema';
+import { snowflakeSchema } from '../util/snowflakeSchema.js';
 
 @singleton()
 export default class extends Route<Snippet, never> {

diff --git a/packages/api/src/routes/index.ts b/packages/api/src/routes/index.ts
@@ -1,7 +1,7 @@
-export { default as GetSettingsRoute } from './getSettings';
-export { default as UpdateSettingsRoute } from './updateSettings';
-export { default as GetSnippetsRoute } from './getSnippets';
-export { default as GetSnippetRoute } from './getSnippet';
-export { default as CreateSnippetRoute } from './createSnippet';
-export { default as UpdateSnippetRoute } from './updateSnippet';
-export { default as DeleteSnippetRoute } from './deleteSnippet';
+export { default as GetSettingsRoute } from './getSettings.js';
+export { default as UpdateSettingsRoute } from './updateSettings.js';
+export { default as GetSnippetsRoute } from './getSnippets.js';
+export { default as GetSnippetRoute } from './getSnippet.js';
+export { default as CreateSnippetRoute } from './createSnippet.js';
+export { default as UpdateSnippetRoute } from './updateSnippet.js';
+export { default as DeleteSnippetRoute } from './deleteSnippet.js';
diff --git a/packages/api/src/routes/updateSettings.ts b/packages/api/src/routes/updateSettings.ts
@@ -6,7 +6,7 @@ import { s } from '@sapphire/shapeshift';
 import type { Response } from 'polka';
 import { singleton } from 'tsyringe';
 import type { GuildSettings } from '../util/models';
-import { snowflakeSchema } from '../util/snowflakeSchema';
+import { snowflakeSchema } from '../util/snowflakeSchema.js';
 
 const schema = s.object({
 	modmailChannelId: snowflakeSchema.nullish,

diff --git a/packages/api/src/routes/updateSnippet.ts b/packages/api/src/routes/updateSnippet.ts
@@ -9,9 +9,9 @@ import type { RESTPatchAPIApplicationGuildCommandJSONBody } from 'discord-api-ty
 import { Routes } from 'discord-api-types/v10';
 import type { NextHandler, Response } from 'polka';
 import { singleton } from 'tsyringe';
-import { Env } from '../util/env';
+import { Env } from '../util/env.js';
 import type { Snippet } from '../util/models';
-import { snowflakeSchema } from '../util/snowflakeSchema';
+import { snowflakeSchema } from '../util/snowflakeSchema.js';
 
 const schema = s.object({
 	name: s.string.lengthGreaterThan(0).lengthLessThanOrEqual(32).optional,

diff --git a/packages/bot/package.json b/packages/bot/package.json
@@ -4,10 +4,6 @@
 	"private": true,
 	"version": "1.0.0-dev",
 	"type": "module",
-	"imports": {
-		"#struct/*": "./dist/struct/*.js",
-		"#util/*": "./dist/util/*.js"
-	},
 	"scripts": {
 		"lint": "eslint src --ext .ts",
 		"build": "tsc",

diff --git a/packages/bot/src/commands/alert.ts b/packages/bot/src/commands/alert.ts
@@ -3,8 +3,8 @@ import type { PermissionResolvable } from 'discord.js';
 import { ApplicationCommandType, type ChatInputCommandInteraction } from 'discord.js';
 import i18next from 'i18next';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
-import { durationAutoComplete } from '#util/durationAutoComplete';
+import { getLocalizedProp, type CommandBody, type Command } from '../struct/Command.js';
+import { durationAutoComplete } from '../util/durationAutoComplete.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.ChatInput> {

diff --git a/packages/bot/src/commands/block.ts b/packages/bot/src/commands/block.ts
@@ -9,8 +9,8 @@ import {
 } from 'discord.js';
 import i18next from 'i18next';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
-import { durationAutoComplete } from '#util/durationAutoComplete';
+import { getLocalizedProp, type CommandBody, type Command } from '../struct/Command.js';
+import { durationAutoComplete } from '../util/durationAutoComplete.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.ChatInput> {

diff --git a/packages/bot/src/commands/close.ts b/packages/bot/src/commands/close.ts
@@ -4,9 +4,9 @@ import type { PermissionResolvable, ThreadChannel } from 'discord.js';
 import { ApplicationCommandOptionType, ApplicationCommandType, type ChatInputCommandInteraction } from 'discord.js';
 import i18next from 'i18next';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
-import { closeThread } from '#util/closeThread';
-import { durationAutoComplete } from '#util/durationAutoComplete';
+import { getLocalizedProp, type CommandBody, type Command } from '../struct/Command.js';
+import { closeThread } from '../util/closeThread.js';
+import { durationAutoComplete } from '../util/durationAutoComplete.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.ChatInput> {

diff --git a/packages/bot/src/commands/config.ts b/packages/bot/src/commands/config.ts
@@ -10,7 +10,7 @@ import {
 	type ChatInputCommandInteraction,
 } from 'discord.js';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
+import { getLocalizedProp, type CommandBody, type Command } from '../struct/Command.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.ChatInput> {
@@ -101,7 +101,7 @@ export default class implements Command<ApplicationCommandType.ChatInput> {
 
 		return interaction.reply({
 			content: stripIndents`
-				• **modmail channel**: ${configured.modmailChannelId ? `<#${configured.modmailChannelId}>` : 'none'}
+				• **modmail channel**: ${configured.modmailChannelId ? `<../${configured.modmailChannelId}>` : 'none'}
 				• **greeting message**: ${configured.greetingMessage ? configured.greetingMessage : 'none'}
 				• **farewell message**: ${configured.farewellMessage ? configured.farewellMessage : 'none'}
 				• **simple mode**: ${configured.simpleMode ? 'enabled' : 'disabled'}

diff --git a/packages/bot/src/commands/context-menus/createSnippet.ts b/packages/bot/src/commands/context-menus/createSnippet.ts
@@ -1,9 +1,9 @@
 import type { MessageContextMenuCommandInteraction, PermissionResolvable } from 'discord.js';
 import { ApplicationCommandType } from 'discord.js';
 import { singleton } from 'tsyringe';
-import type { Command, CommandBody } from '#struct/Command';
-import { getLocalizedProp } from '#struct/Command';
-import promptSnippetAdd from '../../modals/snippets/add';
+import promptSnippetAdd from '../../modals/snippets/add.js';
+import type { Command, CommandBody } from '../../struct/Command.js';
+import { getLocalizedProp } from '../../struct/Command.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.Message> {

diff --git a/packages/bot/src/commands/context-menus/expose.ts b/packages/bot/src/commands/context-menus/expose.ts
@@ -3,7 +3,7 @@ import type { MessageContextMenuCommandInteraction, PermissionResolvable } from
 import { ApplicationCommandType, Client } from 'discord.js';
 import i18next from 'i18next';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
+import { getLocalizedProp, type CommandBody, type Command } from '../../struct/Command.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.Message> {

diff --git a/packages/bot/src/commands/context-menus/open.ts b/packages/bot/src/commands/context-menus/open.ts
@@ -1,8 +1,8 @@
 import type { PermissionResolvable } from 'discord.js';
 import { ApplicationCommandType, type UserContextMenuCommandInteraction } from 'discord.js';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
-import { openThread } from '#util/handleThreadManagement';
+import { getLocalizedProp, type CommandBody, type Command } from '../../struct/Command.js';
+import { openThread } from '../../util/handleThreadManagement.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.User> {

diff --git a/packages/bot/src/commands/context-menus/reply-anon.ts b/packages/bot/src/commands/context-menus/reply-anon.ts
@@ -1,8 +1,8 @@
 import type { MessageContextMenuCommandInteraction, PermissionResolvable } from 'discord.js';
 import { ApplicationCommandType } from 'discord.js';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
-import ReplyContextMenu from './reply';
+import { getLocalizedProp, type CommandBody, type Command } from '../../struct/Command.js';
+import ReplyContextMenu from './reply.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.Message> {

diff --git a/packages/bot/src/commands/context-menus/reply.ts b/packages/bot/src/commands/context-menus/reply.ts
@@ -3,8 +3,8 @@ import type { MessageContextMenuCommandInteraction, PermissionResolvable, Thread
 import { ApplicationCommandType } from 'discord.js';
 import i18next from 'i18next';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
-import { sendStaffThreadMessage } from '#util/sendStaffThreadMessage';
+import { getLocalizedProp, type CommandBody, type Command } from '../../struct/Command.js';
+import { sendStaffThreadMessage } from '../../util/sendStaffThreadMessage.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.Message> {

diff --git a/packages/bot/src/commands/delete.ts b/packages/bot/src/commands/delete.ts
@@ -8,7 +8,7 @@ import {
 } from 'discord.js';
 import i18next from 'i18next';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
+import { getLocalizedProp, type CommandBody, type Command } from '../struct/Command.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.ChatInput> {

diff --git a/packages/bot/src/commands/edit.ts b/packages/bot/src/commands/edit.ts
@@ -1,8 +1,8 @@
 import type { PermissionResolvable } from 'discord.js';
 import { ApplicationCommandOptionType, ApplicationCommandType, type ChatInputCommandInteraction } from 'discord.js';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
-import { handleStaffThreadMessage, HandleStaffThreadMessageAction } from '#util/handleStaffThreadMessage';
+import { getLocalizedProp, type CommandBody, type Command } from '../struct/Command.js';
+import { handleStaffThreadMessage, HandleStaffThreadMessageAction } from '../util/handleStaffThreadMessage.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.ChatInput> {

diff --git a/packages/bot/src/commands/logs.ts b/packages/bot/src/commands/logs.ts
@@ -16,9 +16,9 @@ import {
 } from 'discord.js';
 import i18next from 'i18next';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
-import type { SelectMenuPaginatorConsumers } from '#struct/SelectMenuPaginator';
-import { SelectMenuPaginator } from '#struct/SelectMenuPaginator';
+import { getLocalizedProp, type CommandBody, type Command } from '../struct/Command.js';
+import type { SelectMenuPaginatorConsumers } from '../struct/SelectMenuPaginator.js';
+import { SelectMenuPaginator } from '../struct/SelectMenuPaginator.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.ChatInput> {

diff --git a/packages/bot/src/commands/open.ts b/packages/bot/src/commands/open.ts
@@ -1,8 +1,8 @@
 import type { PermissionResolvable } from 'discord.js';
 import { ApplicationCommandOptionType, ApplicationCommandType, type ChatInputCommandInteraction } from 'discord.js';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
-import { openThread } from '#util/handleThreadManagement';
+import { getLocalizedProp, type CommandBody, type Command } from '../struct/Command.js';
+import { openThread } from '../util/handleThreadManagement.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.ChatInput> {

diff --git a/packages/bot/src/commands/reply.ts b/packages/bot/src/commands/reply.ts
@@ -8,8 +8,8 @@ import {
 	type ChatInputCommandInteraction,
 } from 'discord.js';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
-import { handleStaffThreadMessage, HandleStaffThreadMessageAction } from '#util/handleStaffThreadMessage';
+import { getLocalizedProp, type CommandBody, type Command } from '../struct/Command.js';
+import { handleStaffThreadMessage, HandleStaffThreadMessageAction } from '../util/handleStaffThreadMessage.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.ChatInput> {

diff --git a/packages/bot/src/commands/snippets/add.ts b/packages/bot/src/commands/snippets/add.ts
@@ -4,8 +4,8 @@ import type {
 	PermissionResolvable,
 } from 'discord.js';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type Subcommand } from '#struct/Command';
-import promptSnippetAdd from '../../modals/snippets/add';
+import promptSnippetAdd from '../../modals/snippets/add.js';
+import { getLocalizedProp, type Subcommand } from '../../struct/Command.js';
 
 @singleton()
 export default class implements Subcommand {

diff --git a/packages/bot/src/commands/snippets/edit.ts b/packages/bot/src/commands/snippets/edit.ts
@@ -7,7 +7,7 @@ import {
 } from 'discord.js';
 import i18next from 'i18next';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type Subcommand } from '#struct/Command';
+import { getLocalizedProp, type Subcommand } from '../../struct/Command.js';
 
 @singleton()
 export default class implements Subcommand {

diff --git a/packages/bot/src/commands/snippets/index.ts b/packages/bot/src/commands/snippets/index.ts
@@ -2,8 +2,8 @@ import { PrismaClient } from '@prisma/client';
 import type { ApplicationCommandType } from 'discord.js';
 import { PermissionsBitField, type ApplicationCommandOptionChoiceData, type AutocompleteInteraction } from 'discord.js';
 import { singleton } from 'tsyringe';
-import type { CommandWithSubcommands } from '#struct/Command';
-import { getLocalizedProp, type CommandBody } from '#struct/Command';
+import type { CommandWithSubcommands } from '../../struct/Command.js';
+import { getLocalizedProp, type CommandBody } from '../../struct/Command.js';
 
 @singleton()
 export default class implements CommandWithSubcommands {

diff --git a/packages/bot/src/commands/snippets/list.ts b/packages/bot/src/commands/snippets/list.ts
@@ -10,9 +10,9 @@ import {
 } from 'discord.js';
 import i18next from 'i18next';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type Subcommand } from '#struct/Command';
-import { SelectMenuPaginator, type SelectMenuPaginatorConsumers } from '#struct/SelectMenuPaginator';
-import { ellipsis } from '#util/ellipsis';
+import { getLocalizedProp, type Subcommand } from '../../struct/Command.js';
+import { SelectMenuPaginator, type SelectMenuPaginatorConsumers } from '../../struct/SelectMenuPaginator.js';
+import { ellipsis } from '../../util/ellipsis.js';
 
 @singleton()
 export default class implements Subcommand {

diff --git a/packages/bot/src/commands/snippets/remove.ts b/packages/bot/src/commands/snippets/remove.ts
@@ -7,7 +7,7 @@ import {
 } from 'discord.js';
 import i18next from 'i18next';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type Subcommand } from '#struct/Command';
+import { getLocalizedProp, type Subcommand } from '../../struct/Command.js';
 
 @singleton()
 export default class implements Subcommand {

diff --git a/packages/bot/src/commands/snippets/show.ts b/packages/bot/src/commands/snippets/show.ts
@@ -17,10 +17,10 @@ import {
 } from 'discord.js';
 import i18next from 'i18next';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type Subcommand } from '#struct/Command';
-import { SelectMenuPaginator, type SelectMenuPaginatorConsumers } from '#struct/SelectMenuPaginator';
-import { diff } from '#util/diff';
-import { ellipsis } from '#util/ellipsis';
+import { getLocalizedProp, type Subcommand } from '../../struct/Command.js';
+import { SelectMenuPaginator, type SelectMenuPaginatorConsumers } from '../../struct/SelectMenuPaginator.js';
+import { diff } from '../../util/diff.js';
+import { ellipsis } from '../../util/ellipsis.js';
 
 @singleton()
 export default class implements Subcommand {
@@ -156,7 +156,7 @@ export default class implements Subcommand {
 					.setFooter({
 						text: i18next.t('commands.snippets.show.history.embed.footer', {
 							lng: interaction.locale,
-							user: updatedBy?.tag ?? 'Unknown User#0000',
+							user: updatedBy?.tag ?? 'Unknown User../0000',
 						}),
 						iconURL: updatedBy?.displayAvatarURL(),
 					})

diff --git a/packages/bot/src/commands/unblock.ts b/packages/bot/src/commands/unblock.ts
@@ -9,7 +9,7 @@ import {
 import i18next from 'i18next';
 import { PrismaError } from 'prisma-error-enum';
 import { singleton } from 'tsyringe';
-import { getLocalizedProp, type CommandBody, type Command } from '#struct/Command';
+import { getLocalizedProp, type CommandBody, type Command } from '../struct/Command.js';
 
 @singleton()
 export default class implements Command<ApplicationCommandType.ChatInput> {

diff --git a/packages/bot/src/deploy.ts b/packages/bot/src/deploy.ts
@@ -1,5 +1,5 @@
 import { container } from 'tsyringe';
-import { CommandHandler } from '#struct/CommandHandler';
+import { CommandHandler } from './struct/CommandHandler.js';
 
 export async function deploySlashCommands(): Promise<void> {
 	const commandHandler = container.resolve(CommandHandler);

diff --git a/packages/bot/src/events/error.ts b/packages/bot/src/events/error.ts
@@ -1,7 +1,7 @@
 import { Events } from 'discord.js';
 import { singleton } from 'tsyringe';
-import type { Event } from '#struct/Event';
-import { logger } from '#util/logger';
+import type { Event } from '../struct/Event.js';
+import { logger } from '../util/logger.js';
 
 @singleton()
 export default class implements Event<typeof Events.Error> {