From f745a570bdbf4bc1525616a8e54a0b95677cc51f Mon Sep 17 00:00:00 2001
From: "Henry Q. Dineen" <henryqdineen@users.noreply.github.com>
Date: Fri, 26 Jun 2026 14:25:09 -0400
Subject: [PATCH] [docs] Add @stylexjs/no-conflicting-props to eslint-plugin
 docs

The rule was added in #1381 but the docs page was never updated to include it.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../docs/api/configuration/eslint-plugin.mdx        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/docs/content/docs/api/configuration/eslint-plugin.mdx b/packages/docs/content/docs/api/configuration/eslint-plugin.mdx
index febb9c37c..4070ee3fe 100644
--- a/packages/docs/content/docs/api/configuration/eslint-plugin.mdx
+++ b/packages/docs/content/docs/api/configuration/eslint-plugin.mdx
@@ -178,6 +178,19 @@ type Options = {
 };
 ```
 
+### `@stylexjs/no-conflicting-props` rule
+
+Disallows using `className` or `style` props on elements that spread `stylex.props()`, which would cause conflicts.
+
+```ts
+type Options = {
+  // Possible strings where you can import stylex from
+  //
+  // Default: ['stylex', '@stylexjs/stylex']
+  validImports: Array<string | { from: string; as: string }>;
+};
+```
+
 ### `@stylexjs/no-legacy-contextual-styles` rule
 
 ```ts