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

This reverts commit 89f7ae2.

Author: vcarl

.eslintignore

@@ -0,0 +1,4 @@
+build
+# Hack fix to override default behavior for ignore files linted by name
+# https://github.com/eslint/eslint/issues/15010
+!.*

.eslintrc.js

@@ -0,0 +1,22 @@
+/**
+ * @type {import('@types/eslint').Linter.BaseConfig}
+ */
+module.exports = {
+  extends: [
+    "@remix-run/eslint-config",
+    "@remix-run/eslint-config/node",
+    "@remix-run/eslint-config/jest-testing-library",
+    "prettier",
+  ],
+  // we're using vitest which has a very similar API to jest
+  // (so the linting plugins work nicely), but it we have to explicitly
+  // set the jest version.
+  settings: {
+    jest: {
+      version: 27,
+    },
+  },
+  rules: {
+    "react/style-prop-object": 0,
+  },
+};

.gitignore

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

.husky/pre-push

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

.lintstagedrc.js

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

Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /app
 COPY package.json package-lock.json ./
 RUN npm install
 
-COPY vite.config.ts tailwind.config.js kysely.config.ts tsconfig.json .eslint* .prettierignore ./
+COPY remix.config.js tailwind.config.js kysely.config.ts tsconfig.json .eslint* .prettierignore ./
 COPY app ./app
 
 RUN npm run build
@@ -20,6 +20,7 @@ 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

app/commands/convene.tsx

@@ -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,7 +145,6 @@ 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,
@@ -173,7 +172,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;
         }

app/commands/reacord/ModResponse.tsx

@@ -1,4 +1,4 @@
-import type { ComponentEventUser } from "reacord";
+import type { UserInfo } 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: ComponentEventUser }) => void;
+  onVote: (result: { vote: Resolution; user: UserInfo }) => void;
   onResolve: (result: Resolution) => Promise<void>;
   modRoleId: string;
 }) => {

app/commands/setupTickets.ts

@@ -15,7 +15,7 @@ import {
 import { REST } from "@discordjs/rest";
 import { Routes, TextInputStyle } from "discord-api-types/v10";
 
-import { discordToken } from "~/helpers/env.server";
+import { discordToken } from "~/helpers/env";
 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-expect-error Types for this are super busted
+          // @ts-ignore
           new ActionRowBuilder().addComponents(
             new ButtonBuilder()
               .setCustomId(`close-ticket||${user.id}`)

app/components/login.tsx

@@ -1,4 +1,4 @@
-import { Form } from "react-router";
+import { Form } from "@remix-run/react";
 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) {