chore: switch to oxfmt

Author: AnthonyFuller

.oxfmtrc.json

@@ -0,0 +1,24 @@
+{
+    "$schema": "./node_modules/oxfmt/configuration_schema.json",
+    "semi": false,
+    "tabWidth": 4,
+    "trailingComma": "all",
+    "printWidth": 80,
+    "sortPackageJson": false,
+    "ignorePatterns": [
+        "node_modules",
+        "userdata",
+        "build",
+        "contractSessions",
+        "chunk*.js",
+        "webui/dist",
+        "*.plugin.js",
+        "*Plugin.js",
+        "components/contracts.json",
+        "logs",
+        "resources/**/*.json",
+        "!resources/locale.json",
+        "packaging/add_itemsize/*",
+        "!packaging/add_itemsize/add_itemsize.js"
+    ]
+}

.prettierignore

@@ -471,7 +471,7 @@ export class HitsCategoryService {
             case "completed":
                 return Boolean(
                     played[contractId]?.Completed &&
-                        !played[contractId]?.IsEscalation,
+                    !played[contractId]?.IsEscalation,
                 )
             case "failed":
                 return (

components/contracts/hitsCategoryService.ts

@@ -406,8 +406,7 @@ export class MenuSystemDatabase {
                                                             $datacontext: {
                                                                 in: "$.",
                                                                 datavalues: {
-                                                                    AutoStart:
-                                                                        false,
+                                                                    AutoStart: false,
                                                                 },
                                                                 do: {
                                                                     $include: {

components/menus/menuSystem.ts

@@ -71,8 +71,7 @@ export type Toggle = IContextListener<"toggle">
 /**
  * Used to count things during a challenge.
  */
-export interface ObjectiveCounter
-    extends IContextListener<"objective-counter"> {
+export interface ObjectiveCounter extends IContextListener<"objective-counter"> {
     /**
      * Locale string for the HUD display.
      */

components/statemachines/contextListeners.ts

@@ -128,12 +128,12 @@ export interface RequestWithJwt<
     RequestBody = any,
     Params = core.ParamsDictionary,
 > extends Request<
-        Params,
-        // eslint-disable-next-line
-        any,
-        RequestBody,
-        core.Query & Query
-    > {
+    Params,
+    // eslint-disable-next-line
+    any,
+    RequestBody,
+    core.Query & Query
+> {
     /**
      * The user's JSON Web Token (JWT) data.
      */

components/types/types.ts

@@ -6,8 +6,8 @@
     "scripts": {
         "start": "node chunk0.js",
         "clean": "premove build",
-        "prettier": "pprettier --write \"**/*.{js,json,ts,md,tsx,css,mjs,html}\"",
-        "prettier:check": "pprettier --check \"**/*.{js,json,ts,md,tsx,css,mjs,html}\"",
+        "prettier": "oxfmt --write \"**/*.{js,json,ts,md,tsx,css,mjs,html}\"",
+        "prettier:check": "oxfmt --check \"**/*.{js,json,ts,md,tsx,css,mjs,html}\"",
         "build": "yarn webui:build && node packaging/build.mjs",
         "build-plugins": "node --no-warnings packaging/buildPlugins.mjs",
         "typecheck-ws": "tsc",
@@ -22,11 +22,6 @@
         "extract-featured-contracts": "node packaging/extractFeaturedContracts.mjs",
         "find-circular": "yarn dlx dpdm components/index.ts --exclude \"(components/types)|(node_modules)\" -T"
     },
-    "prettier": {
-        "semi": false,
-        "tabWidth": 4,
-        "trailingComma": "all"
-    },
     "resolutions": {
         "debug": "^4.3.4",
         "iconv-lite": "^0.6.3",
@@ -76,7 +71,6 @@
         "@eslint/eslintrc": "^3.1.0",
         "@eslint/js": "^9.4.0",
         "@peacockproject/eslint-plugin": "workspace:*",
-        "@rdil/parallel-prettier": "^3.0.0",
         "@types/express": "^5.0.0",
         "@types/jsonwebtoken": "^9.0.9",
         "@types/node": "^22.13.10",
@@ -90,15 +84,14 @@
         "esbuild": "^0.25.0",
         "esbuild-register": "^3.6.0",
         "eslint": "^9.22.0",
-        "eslint-config-prettier": "^10.1.1",
         "eslint-plugin-promise": "^7.2.1",
         "eslint-plugin-react-hooks": "^5.2.0",
         "fast-glob": "^3.3.3",
         "globals": "^16.0.0",
         "json-keys-sort": "^2.1.0",
         "ms": "^2.1.3",
+        "oxfmt": "^0.42.0",
         "premove": "^4.0.0",
-        "prettier": "^3.5.3",
         "terser": "^5.39.0",
         "typescript": "5.8.2",
         "winston": "3.13.0",

package.json

@@ -23,7 +23,7 @@ import { mkdir, readdir, readFile, unlink, writeFile } from "fs/promises"
 import { createHash } from "crypto"
 import { Packr } from "msgpackr"
 import glob from "fast-glob"
-import prettier from "prettier"
+import { format } from "oxfmt"
 
 const packer = new Packr({
     bundleStrings: true,
@@ -73,15 +73,18 @@ export async function generateRequireTable() {
         requiresTable.push(`"@peacockproject/core/${importPath}": ${variable}`)
     }
 
-    const prettierConfig = {
-        parser: "babel",
+    const formatConfig = {
         semi: false,
         tabWidth: 4,
         trailingComma: "all",
+        printWidth: 80,
     }
 
+    const fileName = "components/generatedPeacockRequireTable.ts"
+
     // language=TypeScript
-    const generatedPeacockRequireTableFile = await prettier.format(
+    const result = await format(
+        fileName,
         `/*
 *     The Peacock Project - a HITMAN server replacement.
 *     Copyright (C) 2021-2026 The Peacock Project Team
@@ -105,13 +108,10 @@ export async function generateRequireTable() {
         export default {
             ${requiresTable.join(",\n")}
         }`,
-        prettierConfig,
+        formatConfig,
     )
 
-    await writeFile(
-        "components/generatedPeacockRequireTable.ts",
-        generatedPeacockRequireTableFile,
-    )
+    await writeFile(fileName, result.code)
 }
 
 export async function packResources() {

packaging/buildTasks.mjs

@@ -51,9 +51,7 @@ export function LoadoutsForGameVersion({
         return <p>Loading...</p>
     }
 
-    // note: putting these 2 consts together make intellij and prettier conflict each other
     const theGameVer = data[`h${gameVersion}`] as LoadoutsGameVersion
-
     const loadoutsForVersion: Loadout[] = theGameVer.loadouts
 
     return (

webui/src/LoadoutsForGameVersion.tsx

@@ -60,8 +60,8 @@ export function EscalationLevelPage() {
 
     const isReadyToSelectUser = Boolean(
         user === undefined &&
-            userData &&
-            (userData as { error: string } & BasicUser[])?.error !== "bad gv",
+        userData &&
+        (userData as { error: string } & BasicUser[])?.error !== "bad gv",
     )
 
     function getStatus(): string {