Upgrade to react-router@7, eslint@9, version bump the rest (#101)

Goal here is to get fully up-to-date with modern Remix/React Router.
I've gotten this working ~ correctly (as best I can tell right now) with
hot reloading for server/Remix/client (which are different things! the
Express server and Remix SSR are built separately, it's a PITA).

This is a draft PR while I continue working on moving to React Router v7
(from Remix v2).

Author: vcarl

.eslintignore

@@ -10,6 +10,5 @@ yarn.lock
 *.log
 k8s-context
 *.sqlite3
-/cypress/screenshots
-/cypress/videos
 tsconfig.tsbuildinfo
+.react-router

.eslintrc.js

@@ -1,4 +1,2 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
 
 npm run validate

.gitignore

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   "**/*.[tj]s?(x)": ["eslint --fix --max-warnings=0", "prettier --check"],
   "migrations/*.[tj]s": [
     "npm run start:migrate",

.husky/pre-push

@@ -4,7 +4,7 @@ WORKDIR /app
 COPY package.json package-lock.json ./
 RUN npm install
 
-COPY remix.config.js tailwind.config.js kysely.config.ts tsconfig.json .eslint* .prettierignore ./
+COPY vite.config.ts tailwind.config.js kysely.config.ts tsconfig.json .eslint* .prettierignore ./
 COPY app ./app
 
 RUN npm run build
@@ -20,7 +20,6 @@ ADD package.json package-lock.json ./
 RUN npm prune --production
 
 COPY --from=build /app/build ./build
-COPY --from=build /app/public ./public
 
 COPY kysely.config.ts ./
 COPY migrations ./migrations

.lintstagedrc.js

@@ -82,7 +82,7 @@ export const handler = async (
                 staff,
                 extra: "✅ Restricted",
               }),
-              applyRestriction(message.member!),
+              applyRestriction(message.member),
               message.reply(
                 "After a vote by the mods, this member has had restrictions applied to them",
               ),
@@ -96,7 +96,7 @@ export const handler = async (
                 staff,
                 extra: "✅ Kicked",
               }),
-              kick(message.member!),
+              kick(message.member),
               message.reply(
                 "After a vote by the mods, this member has been kicked from the server to cool off",
               ),
@@ -110,13 +110,13 @@ export const handler = async (
                 staff,
                 extra: "✅ Banned",
               }),
-              ban(message.member!),
+              ban(message.member),
               message.reply(
                 "After a vote by the mods, this member has been permanently banned",
               ),
             ]);
             return;
-          case resolutions.nudge:
+          case resolutions.nudge: {
             const [thread] = await Promise.all([
               originalChannel.threads.create({
                 name: message.author.username,
@@ -145,6 +145,7 @@ This isn't a formal warning, but your message concerned the moderators enough th
 
   ${quoteAndEscape(message.content)}`);
             return;
+          }
           case resolutions.warning:
             reportUser({
               reason: ReportReasons.mod,
@@ -172,7 +173,7 @@ This isn't a formal warning, but your message concerned the moderators enough th
               staff,
               extra: "✅ Timed out overnight",
             });
-            timeout(message.member!);
+            timeout(message.member);
 
             return;
         }

Dockerfile

@@ -1,4 +1,4 @@
-import type { UserInfo } from "reacord";
+import type { ComponentEventUser } from "reacord";
 import { Button } from "reacord";
 
 import type { Resolution } from "~/helpers/modResponse";
@@ -17,7 +17,7 @@ export const ModResponse = ({
   modRoleId,
 }: {
   votesRequired?: number;
-  onVote: (result: { vote: Resolution; user: UserInfo }) => void;
+  onVote: (result: { vote: Resolution; user: ComponentEventUser }) => void;
   onResolve: (result: Resolution) => Promise<void>;
   modRoleId: string;
 }) => {

app/commands/convene.tsx

@@ -15,7 +15,7 @@ import {
 import { REST } from "@discordjs/rest";
 import { Routes, TextInputStyle } from "discord-api-types/v10";
 
-import { discordToken } from "~/helpers/env";
+import { discordToken } from "~/helpers/env.server";
 import { SETTINGS, fetchSettings } from "~/models/guilds.server";
 import { format } from "date-fns";
 import type {
@@ -114,7 +114,7 @@ export default [
       await thread.send({
         content: "When you’ve finished, please close the ticket.",
         components: [
-          // @ts-ignore
+          // @ts-expect-error Types for this are super busted
           new ActionRowBuilder().addComponents(
             new ButtonBuilder()
               .setCustomId(`close-ticket||${user.id}`)

app/commands/reacord/ModResponse.tsx

@@ -1,4 +1,4 @@
-import { Form } from "@remix-run/react";
+import { Form } from "react-router";
 import type { ButtonHTMLAttributes } from "react";
 
 interface LoginProps extends ButtonHTMLAttributes<Element> {
@@ -8,7 +8,7 @@ interface LoginProps extends ButtonHTMLAttributes<Element> {
 
 export function Login({
   children = "Log in with Discord",
-  errors,
+  // errors,
   redirectTo,
   ...props
 }: LoginProps) {