Improve the build, remove unused dependencies (#103)

vcarl · web-flow · commit 787a3d4ba6c8 · 2024-12-29T19:54:40.000-05:00
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
 
       - run: npm ci
 
@@ -40,7 +40,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
 
       - run: npm ci
 
@@ -57,7 +57,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
 
       - run: npm ci
 
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v22.12.0
diff --git a/app/commands/convene.tsx b/app/commands/convene.tsx
@@ -9,14 +9,14 @@ import type {
 } from "discord.js";
 import { ApplicationCommandType } from "discord-api-types/v10";
 
-import { reacord } from "~/discord/client.server";
-import { quoteAndEscape } from "~/helpers/discord";
-import { ReportReasons, reportUser } from "~/helpers/modLog";
-import { resolutions } from "~/helpers/modResponse";
+import { reacord } from "#~/discord/client.server";
+import { quoteAndEscape } from "#~/helpers/discord";
+import { ReportReasons, reportUser } from "#~/helpers/modLog";
+import { resolutions } from "#~/helpers/modResponse";
 
-import { fetchSettings, SETTINGS } from "~/models/guilds.server";
-import { applyRestriction, ban, kick, timeout } from "~/models/discord.server";
-import { ModResponse } from "~/commands/reacord/ModResponse";
+import { fetchSettings, SETTINGS } from "#~/models/guilds.server";
+import { applyRestriction, ban, kick, timeout } from "#~/models/discord.server";
+import { ModResponse } from "#~/commands/reacord/ModResponse";
 
 export const command = new ContextMenuCommandBuilder()
   .setName("Convene mods")
diff --git a/app/commands/reacord/ModResponse.tsx b/app/commands/reacord/ModResponse.tsx
@@ -1,12 +1,12 @@
 import type { ComponentEventUser } from "reacord";
 import { Button } from "reacord";
 
-import type { Resolution } from "~/helpers/modResponse";
+import type { Resolution } from "#~/helpers/modResponse";
 import {
   humanReadableResolutions,
   resolutions,
   useVotes,
-} from "~/helpers/modResponse";
+} from "#~/helpers/modResponse";
 
 const VOTES_TO_APPROVE = 3;
 
diff --git a/app/commands/report.ts b/app/commands/report.ts
@@ -1,7 +1,7 @@
 import type { MessageContextMenuCommandInteraction } from "discord.js";
 import { PermissionFlagsBits, ContextMenuCommandBuilder } from "discord.js";
 import { ApplicationCommandType } from "discord-api-types/v10";
-import { ReportReasons, reportUser } from "~/helpers/modLog";
+import { ReportReasons, reportUser } from "#~/helpers/modLog";
 
 export const command = new ContextMenuCommandBuilder()
   .setName("Report")
diff --git a/app/commands/setup.ts b/app/commands/setup.ts
@@ -1,7 +1,7 @@
 import type { ChatInputCommandInteraction } from "discord.js";
 import { PermissionFlagsBits, SlashCommandBuilder } from "discord.js";
 
-import { SETTINGS, setSettings, registerGuild } from "~/models/guilds.server";
+import { SETTINGS, setSettings, registerGuild } from "#~/models/guilds.server";
 
 export const command = new SlashCommandBuilder()
   .setName("setup")
diff --git a/app/commands/setupTickets.ts b/app/commands/setupTickets.ts
@@ -15,16 +15,16 @@ import {
 import { REST } from "@discordjs/rest";
 import { Routes, TextInputStyle } from "discord-api-types/v10";
 
-import { discordToken } from "~/helpers/env.server";
-import { SETTINGS, fetchSettings } from "~/models/guilds.server";
+import { discordToken } from "#~/helpers/env.server";
+import { SETTINGS, fetchSettings } from "#~/models/guilds.server";
 import { format } from "date-fns";
 import type {
   AnyCommand,
   MessageComponentCommand,
   ModalCommand,
   SlashCommand,
-} from "~/helpers/discord";
-import { quoteMessageContent } from "~/helpers/discord";
+} from "#~/helpers/discord";
+import { quoteMessageContent } from "#~/helpers/discord";
 
 const rest = new REST({ version: "10" }).setToken(discordToken);
 
diff --git a/app/commands/track.tsx b/app/commands/track.tsx
@@ -2,9 +2,9 @@ import type { MessageContextMenuCommandInteraction } from "discord.js";
 import { PermissionFlagsBits, ContextMenuCommandBuilder } from "discord.js";
 import { ApplicationCommandType } from "discord-api-types/v10";
 import { Button } from "reacord";
-import { reacord } from "~/discord/client.server";
+import { reacord } from "#~/discord/client.server";
 
-import { ReportReasons, reportUser } from "~/helpers/modLog";
+import { ReportReasons, reportUser } from "#~/helpers/modLog";
 
 export const command = new ContextMenuCommandBuilder()
   .setName("Track")
diff --git a/app/discord/activityTracker.ts b/app/discord/activityTracker.ts
@@ -1,6 +1,6 @@
 import { Events, ChannelType } from "discord.js";
 import type { Client, Message, PartialMessage, TextChannel } from "discord.js";
-import db from "~/db.server";
+import db from "#~/db.server";
 
 export async function startActivityTracking(client: Client) {
   const channelCache = new Map<string, TextChannel>();
diff --git a/app/discord/api.ts b/app/discord/api.ts
@@ -1,4 +1,4 @@
 import { REST } from "discord.js";
-import { discordToken } from "~/helpers/env.server";
+import { discordToken } from "#~/helpers/env.server";
 
 export const rest = new REST({ version: "10" }).setToken(discordToken);
diff --git a/app/discord/automod.test.ts b/app/discord/automod.test.ts
@@ -1,6 +1,6 @@
 import { isSpam } from "./automod";
 
-vi.mock("~/helpers/env.server");
+vi.mock("#~/helpers/env.server");
 
 test("isSpam has a reasonable threshold", () => {
   expect(isSpam("Hello @everyone")).toBe(true);
diff --git a/app/discord/automod.ts b/app/discord/automod.ts
@@ -1,7 +1,7 @@
 import type { Client } from "discord.js";
 
-import { isStaff } from "~/helpers/discord";
-import { reportUser, ReportReasons } from "~/helpers/modLog";
+import { isStaff } from "#~/helpers/discord";
+import { reportUser, ReportReasons } from "#~/helpers/modLog";
 import { client } from "./client.server";
 
 const AUTO_SPAM_THRESHOLD = 3;
diff --git a/app/discord/client.server.ts b/app/discord/client.server.ts
@@ -1,6 +1,6 @@
 import { GatewayIntentBits, Client, Partials, ActivityType } from "discord.js";
 import { ReacordDiscordJs } from "reacord";
-import { discordToken } from "~/helpers/env.server";
+import { discordToken } from "#~/helpers/env.server";
 
 export const client = new Client({
   intents: [
diff --git a/app/discord/deployCommands.server.ts b/app/discord/deployCommands.server.ts
@@ -7,17 +7,17 @@ import type {
 } from "discord.js";
 import { InteractionType, Routes } from "discord.js";
 
-import { rest } from "~/discord/api";
-import type { AnyCommand } from "~/helpers/discord";
+import { rest } from "#~/discord/api";
+import type { AnyCommand } from "#~/helpers/discord";
 import {
   isMessageComponentCommand,
   isMessageContextCommand,
   isModalCommand,
   isSlashCommand,
   isUserContextCommand,
-} from "~/helpers/discord";
-import { applicationId, isProd } from "~/helpers/env.server";
-import { calculateChangedCommands } from "~/helpers/discordCommands";
+} from "#~/helpers/discord";
+import { applicationId, isProd } from "#~/helpers/env.server";
+import { calculateChangedCommands } from "#~/helpers/discordCommands";
 
 /**
  * deployCommands notifies Discord of the latest commands to use and registers
diff --git a/app/discord/gateway.ts b/app/discord/gateway.ts
@@ -1,11 +1,11 @@
-import Sentry from "~/helpers/sentry.server";
+import Sentry from "#~/helpers/sentry.server";
 
-import { client, login } from "~/discord/client.server";
-import { deployCommands } from "~/discord/deployCommands.server";
+import { client, login } from "#~/discord/client.server";
+import { deployCommands } from "#~/discord/deployCommands.server";
 
-import automod from "~/discord/automod";
-import onboardGuild from "~/discord/onboardGuild";
-import { startActivityTracking } from "~/discord/activityTracker";
+import automod from "#~/discord/automod";
+import onboardGuild from "#~/discord/onboardGuild";
+import { startActivityTracking } from "#~/discord/activityTracker";
 
 export default function init() {
   login();
diff --git a/app/discord/onboardGuild.ts b/app/discord/onboardGuild.ts
@@ -1,8 +1,8 @@
 import type { Client, TextChannel } from "discord.js";
 import { ChannelType } from "discord.js";
-import { retry } from "~/helpers/misc";
+import { retry } from "#~/helpers/misc";
 
-import { fetchGuild } from "~/models/guilds.server";
+import { fetchGuild } from "#~/models/guilds.server";
 
 export default async (bot: Client) => {
   // This is called any time the bot comes online, when a server becomes
diff --git a/app/helpers/__mocks__/env.server.ts b/app/helpers/__mocks__/env.server.ts
@@ -1,6 +1,6 @@
 export const isProd = () => false;
 
-export const databaseUrl = "DATABASE_URL";
+export const databaseUrl = undefined;
 export const sessionSecret = "SESSION_SECRET";
 
 export const applicationKey = "DISCORD_PUBLIC_KEY";
diff --git a/app/helpers/discordCommands.ts b/app/helpers/discordCommands.ts
@@ -5,7 +5,7 @@ import type {
 } from "discord.js";
 import { ApplicationCommandType } from "discord.js";
 
-import { difference } from "~/helpers/sets";
+import { difference } from "#~/helpers/sets";
 
 export const compareCommands = (
   localCommand: ContextMenuCommandBuilder | SlashCommandBuilder,
diff --git a/app/helpers/modLog.ts b/app/helpers/modLog.ts
@@ -9,15 +9,15 @@ import { MessageType, ChannelType } from "discord.js";
 import { format, formatDistanceToNowStrict } from "date-fns";
 import TTLCache from "@isaacs/ttlcache";
 
-import { fetchSettings, SETTINGS } from "~/models/guilds.server";
+import { fetchSettings, SETTINGS } from "#~/models/guilds.server";
 import {
   constructDiscordLink,
   describeAttachments,
   describeReactions,
   quoteAndEscape,
   quoteAndEscapePoll,
-} from "~/helpers/discord";
-import { simplifyString, truncateMessage } from "~/helpers/string";
+} from "#~/helpers/discord";
+import { simplifyString, truncateMessage } from "#~/helpers/string";
 
 export const enum ReportReasons {
   anonReport = "anonReport",
diff --git a/app/models/activity.server.ts b/app/models/activity.server.ts
@@ -1,5 +1,5 @@
-import type { DB } from "~/db.server";
-import db from "~/db.server";
+import type { DB } from "#~/db.server";
+import db from "#~/db.server";
 
 type MessageStats = DB["message_stats"];
 
diff --git a/app/models/discord.server.ts b/app/models/discord.server.ts
@@ -1,6 +1,6 @@
 import type { GuildMember } from "discord.js";
 import type { AccessToken } from "simple-oauth2";
-import { fetchSettings, SETTINGS } from "~/models/guilds.server";
+import { fetchSettings, SETTINGS } from "#~/models/guilds.server";
 
 export interface DiscordUserInfo {
   id: string;
diff --git a/app/models/guilds.server.ts b/app/models/guilds.server.ts
@@ -1,6 +1,6 @@
 import type { Guild as DiscordGuild } from "discord.js";
-import db, { SqliteError } from "~/db.server";
-import type { DB } from "~/db.server";
+import db, { SqliteError } from "#~/db.server";
+import type { DB } from "#~/db.server";
 
 export type Guild = DB["guilds"];
 
diff --git a/app/models/session.server.ts b/app/models/session.server.ts
@@ -8,19 +8,19 @@ import {
 import { randomUUID } from "crypto";
 import { AuthorizationCode } from "simple-oauth2";
 
-import db from "~/db.server";
-import type { DB } from "~/db.server";
+import db from "#~/db.server";
+import type { DB } from "#~/db.server";
 import {
   createUser,
   getUserByExternalId,
   getUserById,
-} from "~/models/user.server";
-import { fetchUser } from "~/models/discord.server";
+} from "#~/models/user.server";
+import { fetchUser } from "#~/models/discord.server";
 import {
   applicationId,
   discordSecret,
   sessionSecret,
-} from "~/helpers/env.server";
+} from "#~/helpers/env.server";
 
 export type Sessions = DB["sessions"];
 
diff --git a/app/models/user.server.ts b/app/models/user.server.ts
@@ -1,7 +1,7 @@
 import { randomUUID } from "crypto";
 
-import type { DB } from "~/db.server";
-import db from "~/db.server";
+import type { DB } from "#~/db.server";
+import db from "#~/db.server";
 
 export type User = DB["users"];
 
diff --git a/app/routes/__auth.tsx b/app/routes/__auth.tsx
@@ -1,9 +1,9 @@
 import { Outlet, useLoaderData, useLocation } from "react-router";
 
-import { Login } from "~/components/login";
-import { isProd } from "~/helpers/env.server";
-import { getUser } from "~/models/session.server";
-import { useOptionalUser } from "~/utils";
+import { Login } from "#~/components/login";
+import { isProd } from "#~/helpers/env.server";
+import { getUser } from "#~/models/session.server";
+import { useOptionalUser } from "#~/utils";
 
 export async function loader({ request }: { request: Request }) {
   return { user: await getUser(request), isProd: isProd() };
diff --git a/app/routes/__auth/dashboard.tsx b/app/routes/__auth/dashboard.tsx
@@ -1,7 +1,7 @@
 import type { ActionFunction, LoaderFunction } from "react-router";
 import { data, useLoaderData } from "react-router";
 import type { LabelHTMLAttributes } from "react";
-import { getTopParticipants } from "~/models/activity.server";
+import { getTopParticipants } from "#~/models/activity.server";
 
 export const loader = async ({
   request,
diff --git a/app/routes/auth.tsx b/app/routes/auth.tsx
@@ -1,8 +1,8 @@
 import type { ActionFunction, LoaderFunction } from "react-router";
 import { redirect } from "react-router";
 
-import { initOauthLogin } from "~/models/session.server";
-import { Login } from "~/components/login";
+import { initOauthLogin } from "#~/models/session.server";
+import { Login } from "#~/components/login";
 
 export const loader: LoaderFunction = async () => {
   return redirect("/");
diff --git a/app/routes/discord-oauth.tsx b/app/routes/discord-oauth.tsx
@@ -1,5 +1,5 @@
 import { redirect, type LoaderFunction } from "react-router";
-import { completeOauthLogin } from "~/models/session.server";
+import { completeOauthLogin } from "#~/models/session.server";
 
 export const loader: LoaderFunction = async ({ request }) => {
   const url = new URL(request.url);
diff --git a/app/routes/healthcheck.tsx b/app/routes/healthcheck.tsx
@@ -1,6 +1,6 @@
 // learn more: https://fly.io/docs/reference/configuration/#services-http_checks
 import type { LoaderFunction } from "react-router";
-import db from "~/db.server";
+import db from "#~/db.server";
 
 export const loader: LoaderFunction = async ({ request }) => {
   const host =
diff --git a/app/routes/index.tsx b/app/routes/index.tsx
@@ -1,7 +1,7 @@
-import { Login } from "~/components/login";
-import { Logout } from "~/components/logout";
+import { Login } from "#~/components/login";
+import { Logout } from "#~/components/logout";
 
-import { useOptionalUser } from "~/utils";
+import { useOptionalUser } from "#~/utils";
 
 export default function Index() {
   const user = useOptionalUser();
diff --git a/app/routes/logout.tsx b/app/routes/logout.tsx
@@ -1,6 +1,6 @@
 import type { ActionFunction } from "react-router";
 
-import { logout } from "~/models/session.server";
+import { logout } from "#~/models/session.server";
 
 export const action: ActionFunction = async ({ request }) => {
   return await logout(request);
diff --git a/app/server.ts b/app/server.ts
@@ -4,16 +4,16 @@ import { createRequestHandler } from "@react-router/express";
 import express from "express";
 import bodyParser from "body-parser";
 
-import { applicationKey } from "~/helpers/env.server";
+import { applicationKey } from "#~/helpers/env.server";
 
-import discordBot from "~/discord/gateway";
-import { registerCommand } from "~/discord/deployCommands.server";
+import discordBot from "#~/discord/gateway";
+import { registerCommand } from "#~/discord/deployCommands.server";
 
-import * as convene from "~/commands/convene";
-import * as setup from "~/commands/setup";
-import * as report from "~/commands/report";
-import * as track from "~/commands/track";
-import setupTicket from "~/commands/setupTickets";
+import * as convene from "#~/commands/convene";
+import * as setup from "#~/commands/setup";
+import * as report from "#~/commands/report";
+import * as track from "#~/commands/track";
+import setupTicket from "#~/commands/setupTickets";
 
 export const app = express();
 app.use(
diff --git a/app/styles/tailwind.css b/app/styles/tailwind.css
diff --git a/app/utils.ts b/app/utils.ts
diff --git a/index.prod.js b/index.prod.js
diff --git a/kysely.config.ts b/kysely.config.ts
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/test/setup-test-env.ts b/test/setup-test-env.ts
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/vite.config.ts b/vite.config.ts
diff --git a/vitest.config.ts b/vitest.config.ts
