prettier and linting

Author: bristermitten

.github/workflows/docker.yml

@@ -27,5 +27,3 @@ jobs:
       - name: Set Docker tag
         id: date
         run: echo "DATE_STAMP=$(date +%s)" > "$GITHUB_ENV"
-
-    

.husky/pre-commit

@@ -0,0 +1 @@
+bunx lint-staged

Dockerfile

@@ -29,6 +29,7 @@ COPY . .
 # [optional] tests & build
 ENV NODE_ENV=production
 RUN bun run lint
+RUN bun test
 RUN bun run build-prod
 
 # copy production dependencies and source code into final image

bun.lock

@@ -1,11 +1,13 @@
 import globals from "globals";
 import pluginJs from "@eslint/js";
 import tseslint from "typescript-eslint";
+import eslintConfigPrettier from "eslint-config-prettier/flat";
 
 export default [
   { files: ["**/*.{js,mjs,cjs,ts}"] },
   { ignores: [".yarn", "bin"] },
   { languageOptions: { globals: globals.node } },
+  eslintConfigPrettier,
   pluginJs.configs.recommended,
   ...tseslint.configs.recommended,
 ];

eslint.config.js

@@ -15,13 +15,16 @@
     "start-built": "bun --trace-warnings bin/index.js",
     "build-and-run": "bun run build && bun run start-built",
     "build-and-run-prod": "bun run lint && bun run build-prod && bun run start-built",
-    "sentry:sourcemaps": "bunx sentry-cli sourcemaps inject --org developer-den-59 --project discord-bot ./bin && bunx sentry-cli sourcemaps upload --org developer-den-59 --project discord-bot ./bin"
+    "sentry:sourcemaps": "bunx sentry-cli sourcemaps inject --org developer-den-59 --project discord-bot ./bin && bunx sentry-cli sourcemaps upload --org developer-den-59 --project discord-bot ./bin",
+    "prepare": "husky",
+    "lint-staged": {
+      "**/*": "prettier --write --ignore-unknown"
+    }
   },
   "keywords": [],
   "author": "Developer Den",
   "license": "MIT",
   "dependencies": {
-    "@microsoft/eslint-formatter-sarif": "3.1.0",
     "@sentry/bun": "^10.1.0",
     "@sentry/cli": "^2.50.2",
     "@sequelize/core": "^7.0.0-alpha.46",
@@ -57,6 +60,7 @@
   ],
   "repository": "https://github.com/TheDeveloperDen/DevDenBot.git",
   "devDependencies": {
+    "@microsoft/eslint-formatter-sarif": "3.1.0",
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.32.0",
     "@sentry/types": "^8.55.0",
@@ -70,7 +74,10 @@
     "@types/string-similarity": "^4.0.2",
     "@types/validator": "^13.15.2",
     "eslint": "^9.32.0",
+    "eslint-config-prettier": "^10.1.8",
     "globals": "^15.15.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^16.1.4",
     "nodemon": "^3.1.10",
     "prettier": "3.6.2",
     "ts-node": "^10.9.2",

package.json

@@ -11,7 +11,7 @@ export const config: Config = {
     showcase: "847936633964724254",
     auditLog: "1004782799955435540",
     introductions: "888142541592076347",
-    general: "821743100657270876"
+    general: "821743100657270876",
   },
   commands: {
     daily: "1059214166075912225",

src/Config.prod.ts

@@ -10,7 +10,7 @@ export const config: Config = {
     hotTake: "904478147351806015",
     showcase: "952536628533030942",
     auditLog: "994623474557538415",
-    general: "904478147351806015"
+    general: "904478147351806015",
   },
   commands: {
     daily: "1029850807794937949",

src/Config.ts

@@ -1,5 +1,5 @@
-import { test, expect, mock } from "bun:test";
-import { Bump, getStreak } from "./Bump.js";
+import { test, expect } from "bun:test";
+import { getStreak } from "./Bump.js";
 
 test("getStreak", () => {
   const streakData: { userId: bigint }[][] = [