fix: source maps

9 files changed, 91 insertions, 29 deletions

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index a5a2375..c83ce2e 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -1,3 +1,4 @@
+/* eslint-disable import/no-commonjs */
 module.exports = {
 	env: {
 		es2021: true,
diff --git a/.gitattributes b/.gitattributes
index ba651ae..0e88f07 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 * text=auto eol=lf
-yarn.lock linguist-generated
\ No newline at end of file
+yarn.lock linguist-generated
+*.cjs linguist-language=TypeScript
\ No newline at end of file
diff --git a/.gitpod.yml b/.gitpod.yml
index f43c243..7b6b3bd 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,4 +1,4 @@
 # List the start up tasks. Learn more https://www.gitpod.io/docs/config-start-tasks/
 tasks:
-  - init: nvm install node && nvm use 16 && yarn install # runs during prebuild
+  - init: nvm install node && nvm use 17 && yarn install # runs during prebuild
     command: git config --global user.email $GIT_COMMITTER_EMAIL && git config --global user.name $GIT_AUTHOR_NAME
diff --git a/.prettierignore b/.prettierignore
index 71b2a03..60d8cd6 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,3 +2,13 @@ dist
 .git
 .yarn
 .pnp.*
+node_modules
+.idea
+*.code-workspace
+*.log
+.vscode/*
+!.vscode/*.code-snippets
+!.vscode/extensions.json
+!.vscode/launch.json
+!.vscode/settings.json
+!.vscode/tasks.json
\ No newline at end of file
diff --git a/.prettierrc.json b/.prettierrc.json
index 6797105..d704546 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -7,7 +7,7 @@
 	"endOfLine": "lf",
 	"overrides": [
 		{
-			"files": ["*BushClientEvents.d.ts"],
+			"files": ["*BushClientEvents.ts"],
 			"options": {
 				"printWidth": 80
 			}
diff --git a/ecosystem.config.cjs b/ecosystem.config.cjs
index b624f5c..656d30d 100644
--- a/ecosystem.config.cjs
+++ b/ecosystem.config.cjs
@@ -1,31 +1,27 @@
-// eslint-disable-next-line import/no-commonjs
+/* eslint-disable import/no-commonjs */
 module.exports = {
 	apps: [
 		{
 			name: 'bush-bot',
 			script: 'yarn',
-			args: 'node --experimental-json-modules --no-warnings dist/src/bot.js',
+			args: 'start:raw',
 			out_file: '../bushbot.log',
 			error_file: '../bushbot.log',
 			max_memory_restart: '1G',
 			node_args: ['--max_old_space_size=2048'],
-			env: {
-				FORCE_COLOR: '3'
-			},
+			env: { FORCE_COLOR: '3' },
 			exp_backoff_restart_delay: 2500,
 			wait_ready: true
 		},
 		{
 			name: 'bush-bot-beta',
 			script: 'yarn',
-			args: 'node --experimental-json-modules --no-warnings dist/src/bot.js',
+			args: 'start:raw',
 			out_file: '../bushbot-beta.log',
 			error_file: '../bushbot-beta.log',
 			max_memory_restart: '1G',
 			node_args: ['--max_old_space_size=2048'],
-			env: {
-				FORCE_COLOR: '3'
-			},
+			env: { FORCE_COLOR: '3' },
 			exp_backoff_restart_delay: 2500,
 			wait_ready: true
 		}
diff --git a/package.json b/package.json
index 63d1c60..95f0458 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
 	"type": "module",
 	"repository": "https://github.com/NotEnoughUpdates/bush-bot-3.0",
 	"author": "IRONM00N#0001 (@IRONM00N)",
+	"private": true,
 	"contributors": [
 		"jani270#0119 (@jani270)",
 		"Tyman#5998 (@TymanWasTaken)",
diff --git a/src/lib/extensions/discord.js/BushClientEvents.ts b/src/lib/extensions/discord.js/BushClientEvents.ts
index e6cf93f..7437f7f 100644
--- a/src/lib/extensions/discord.js/BushClientEvents.ts
+++ b/src/lib/extensions/discord.js/BushClientEvents.ts
@@ -29,12 +29,23 @@ import type {
 	PartialBushUser
 } from '#lib';
 import type { AkairoClientEvents } from 'discord-akairo';
-import type { Collection, GuildScheduledEvent, Interaction, Invite, Snowflake, Sticker, Typing } from 'discord.js';
+import type {
+	Collection,
+	GuildScheduledEvent,
+	Interaction,
+	Invite,
+	Snowflake,
+	Sticker,
+	Typing
+} from 'discord.js';
 
 export interface BushClientEvents extends AkairoClientEvents {
 	applicationCommandCreate: [command: BushApplicationCommand];
 	applicationCommandDelete: [command: BushApplicationCommand];
-	applicationCommandUpdate: [oldCommand: BushApplicationCommand | null, newCommand: BushApplicationCommand];
+	applicationCommandUpdate: [
+		oldCommand: BushApplicationCommand | null,
+		newCommand: BushApplicationCommand
+	];
 	channelCreate: [channel: BushNonThreadGuildBasedChannel];
 	channelDelete: [channel: BushDMChannel | BushNonThreadGuildBasedChannel];
 	channelPinsUpdate: [channel: BushTextBasedChannel, date: Date];
@@ -66,18 +77,37 @@ export interface BushClientEvents extends AkairoClientEvents {
 			nonce: string | undefined;
 		}
 	];
-	guildMemberUpdate: [oldMember: BushGuildMember | PartialBushGuildMember, newMember: BushGuildMember];
+	guildMemberUpdate: [
+		oldMember: BushGuildMember | PartialBushGuildMember,
+		newMember: BushGuildMember
+	];
 	guildUpdate: [oldGuild: BushGuild, newGuild: BushGuild];
 	inviteCreate: [invite: Invite];
 	inviteDelete: [invite: Invite];
 	messageCreate: [message: BushMessage];
 	messageDelete: [message: BushMessage | PartialBushMessage];
-	messageReactionRemoveAll: [message: BushMessage | PartialBushMessage, reactions: Collection<string, BushMessageReaction>];
-	messageReactionRemoveEmoji: [reaction: BushMessageReaction | PartialBushMessageReaction];
-	messageDeleteBulk: [messages: Collection<Snowflake, BushMessage | PartialBushMessage>];
-	messageReactionAdd: [reaction: BushMessageReaction | PartialBushMessageReaction, user: BushUser | PartialBushUser];
-	messageReactionRemove: [reaction: BushMessageReaction | PartialBushMessageReaction, user: BushUser | PartialBushUser];
-	messageUpdate: [oldMessage: BushMessage | PartialBushMessage, newMessage: BushMessage | PartialBushMessage];
+	messageReactionRemoveAll: [
+		message: BushMessage | PartialBushMessage,
+		reactions: Collection<string, BushMessageReaction>
+	];
+	messageReactionRemoveEmoji: [
+		reaction: BushMessageReaction | PartialBushMessageReaction
+	];
+	messageDeleteBulk: [
+		messages: Collection<Snowflake, BushMessage | PartialBushMessage>
+	];
+	messageReactionAdd: [
+		reaction: BushMessageReaction | PartialBushMessageReaction,
+		user: BushUser | PartialBushUser
+	];
+	messageReactionRemove: [
+		reaction: BushMessageReaction | PartialBushMessageReaction,
+		user: BushUser | PartialBushUser
+	];
+	messageUpdate: [
+		oldMessage: BushMessage | PartialBushMessage,
+		newMessage: BushMessage | PartialBushMessage
+	];
 	presenceUpdate: [oldPresence: BushPresence | null, newPresence: BushPresence];
 	ready: [client: BushClient<true>];
 	invalidated: [];
@@ -87,8 +117,14 @@ export interface BushClientEvents extends AkairoClientEvents {
 	threadCreate: [thread: BushThreadChannel, newlyCreated: boolean];
 	threadDelete: [thread: BushThreadChannel];
 	threadListSync: [threads: Collection<Snowflake, BushThreadChannel>];
-	threadMemberUpdate: [oldMember: BushThreadMember, newMember: BushThreadMember];
-	threadMembersUpdate: [oldMembers: Collection<Snowflake, BushThreadMember>, newMembers: Collection<Snowflake, BushThreadMember>];
+	threadMemberUpdate: [
+		oldMember: BushThreadMember,
+		newMember: BushThreadMember
+	];
+	threadMembersUpdate: [
+		oldMembers: Collection<Snowflake, BushThreadMember>,
+		newMembers: Collection<Snowflake, BushThreadMember>
+	];
 	threadUpdate: [oldThread: BushThreadChannel, newThread: BushThreadChannel];
 	typingStart: [typing: Typing];
 	userUpdate: [oldUser: BushUser | PartialBushUser, newUser: BushUser];
@@ -100,16 +136,28 @@ export interface BushClientEvents extends AkairoClientEvents {
 	shardReconnecting: [shardId: number];
 	shardResume: [shardId: number, replayedEvents: number];
 	stageInstanceCreate: [stageInstance: BushStageInstance];
-	stageInstanceUpdate: [oldStageInstance: BushStageInstance | null, newStageInstance: BushStageInstance];
+	stageInstanceUpdate: [
+		oldStageInstance: BushStageInstance | null,
+		newStageInstance: BushStageInstance
+	];
 	stageInstanceDelete: [stageInstance: BushStageInstance];
 	stickerCreate: [sticker: Sticker];
 	stickerDelete: [sticker: Sticker];
 	stickerUpdate: [oldSticker: Sticker, newSticker: Sticker];
 	guildScheduledEventCreate: [guildScheduledEvent: GuildScheduledEvent];
-	guildScheduledEventUpdate: [oldGuildScheduledEvent: GuildScheduledEvent, newGuildScheduledEvent: GuildScheduledEvent];
+	guildScheduledEventUpdate: [
+		oldGuildScheduledEvent: GuildScheduledEvent,
+		newGuildScheduledEvent: GuildScheduledEvent
+	];
 	guildScheduledEventDelete: [guildScheduledEvent: GuildScheduledEvent];
-	guildScheduledEventUserAdd: [guildScheduledEvent: GuildScheduledEvent, user: BushUser];
-	guildScheduledEventUserRemove: [guildScheduledEvent: GuildScheduledEvent, user: BushUser];
+	guildScheduledEventUserAdd: [
+		guildScheduledEvent: GuildScheduledEvent,
+		user: BushUser
+	];
+	guildScheduledEventUserRemove: [
+		guildScheduledEvent: GuildScheduledEvent,
+		user: BushUser
+	];
 	/* Custom */
 	bushBan: [
 		victim: BushGuildMember | BushUser,
@@ -273,4 +321,9 @@ export interface BushClientEvents extends AkairoClientEvents {
 	];
 }
 
-type Setting = GuildSettings | 'enabledFeatures' | 'blacklistedChannels' | 'blacklistedUsers' | 'disabledCommands';
+type Setting =
+	| GuildSettings
+	| 'enabledFeatures'
+	| 'blacklistedChannels'
+	| 'blacklistedUsers'
+	| 'disabledCommands';
diff --git a/tsconfig.json b/tsconfig.json
index bf8b42d..2bb70c9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,6 +26,6 @@
 		},
 		"skipLibCheck": true
 	},
-	"include": ["src/**/*.ts", "src/**/*d.ts", "lib/**/*.ts", "ecosystem.config.cjs"],
+	"include": ["src/**/*.ts", "src/**/*d.ts", "lib/**/*.ts", "ecosystem.config.cjs", ".eslintrc.cjs"],
 	"exclude": ["dist", "node_modules"]
 }