From 23dccb5c5be57d25a48797ef418bf6b3d07cfc73 Mon Sep 17 00:00:00 2001
From: CDeltakai <deltakai2010@gmail.com>
Date: Wed, 28 May 2025 17:02:01 +1000
Subject: [PATCH 1/2] fix: added in prettier override in the js.ts config so
 the prettier config is actually used for ALL files, not just md/mdx files

---
 .prettierrc       | 15 ---------------
 src/configs/js.ts |  4 ++++
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 .prettierrc

diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index aed2abb..0000000
--- a/.prettierrc
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "semi": true,
-  "trailingComma": "all",
-  "singleQuote": true,
-  "printWidth": 80,
-  "tabWidth": 2,
-  "overrides": [
-    {
-      "files": ["*.md", "*.mdx"],
-      "options": {
-        "proseWrap": "always"
-      }
-    }
-  ]
-}
diff --git a/src/configs/js.ts b/src/configs/js.ts
index 03db240..ad43060 100644
--- a/src/configs/js.ts
+++ b/src/configs/js.ts
@@ -7,6 +7,7 @@ import js from '@eslint/js';
 import tsParser from '@typescript-eslint/parser';
 import { FlatCompat } from '@eslint/eslintrc';
 import { fixupPluginRules } from '@eslint/compat';
+import prettierOptions from './prettier.config.mjs';
 import matrixaiPlugin from '../plugins/eslint-plugin-matrixai.js';
 import { resolveMatrixConfig } from '../utils.js';
 
@@ -66,6 +67,9 @@ const config = [
         },
       ],
 
+      // Prettier override
+      'prettier/prettier': ['error', prettierOptions],
+
       // React rules
       'react/react-in-jsx-scope': 0,
       'react/no-unknown-property': 'off',

From 857338ee98edec16da362f15ef650cef9f1f9b6f Mon Sep 17 00:00:00 2001
From: CDeltakai <deltakai2010@gmail.com>
Date: Wed, 28 May 2025 17:02:24 +1000
Subject: [PATCH 2/2] 0.2.11

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 87ed4e9..013c63d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@matrixai/lint",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@matrixai/lint",
-      "version": "0.2.10",
+      "version": "0.2.11",
       "license": "Apache-2.0",
       "dependencies": {
         "@eslint/compat": "^1.2.5",
diff --git a/package.json b/package.json
index 2899109..1233e30 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@matrixai/lint",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "author": "Roger Qiu",
   "description": "Org wide custom eslint rules",
   "license": "Apache-2.0",