From 34656439f59666ff80a60593682471fb2a590af0 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Fri, 23 Oct 2026 12:15:51 +0000
Subject: [PATCH] chore(lint): update oxlint to ^1.86.0 and align its config
 with sanity-io/ui

- Bump the oxlint catalog entry to ^1.86.0, sanity-io/ui's version when
  this was aligned.
- Match ui's resolved rule set: enable `oxc/no-barrel-file` and ban the
  `styled-components` default import in the shared
  `@sanity/plugin-kit/oxlint` preset, list the `react-perf` plugin (its
  rules stay off), and turn off `react/exhaustive-effect-dependencies`,
  which duplicates `react/exhaustive-deps`.
- Suppress the existing `export *` barrels and drop the suppressions the
  disabled rule leaves unused (comments only).
- Run oxlint on staged scripts in the lefthook pre-commit hook, like
  sanity-io/sanity.

Co-authored-by: Cody Olsen <stipsan@users.noreply.github.com>
---
 .changeset/oxlint-1-86-suppressions.md        | 21 +++++++++++++++++++
 .changeset/plugin-kit-oxlint-1-86.md          |  5 +++++
 AGENTS.md                                     |  9 ++++----
 lefthook.yml                                  |  6 ++++--
 oxlint.config.ts                              |  5 +++--
 packages/@sanity/plugin-kit/src/oxlint.ts     | 10 ++++++++-
 plugins/@sanity/assist/src/_lib/form/index.ts |  1 +
 .../components/AssistDocumentForm.tsx         |  1 -
 .../hooks/useAssistDocumentContextValue.tsx   |  1 -
 plugins/@sanity/assist/src/index.ts           |  1 +
 .../src/blockInsertPicker.tsx                 |  1 -
 .../src/codemirror/CodeMirrorProxy.tsx        |  1 -
 .../cross-dataset-duplicator/src/index.ts     |  1 +
 plugins/@sanity/dashboard/src/index.ts        |  1 +
 .../src/index.ts                              |  1 +
 .../@sanity/embeddings-index-ui/src/index.ts  |  1 +
 .../src/components/experiment/index.ts        |  1 +
 .../src/components/personalization/index.ts   |  1 +
 .../personalization-plugin/src/index.ts       |  1 +
 plugins/@sanity/sfcc/src/structure/index.ts   |  1 +
 .../themer/src/tool/ImagePaletteSection.tsx   |  1 -
 .../src/BaseDocumentDeserializer/index.ts     |  1 +
 .../migrations/index.ts                       |  1 +
 .../src/index.ts                              |  1 +
 plugins/sanity-plugin-markdown/src/index.ts   |  1 +
 .../sanity-plugin-markdown/src/indexNext.ts   |  1 +
 .../src/components/Browser/useBrowserInit.ts  |  1 -
 .../src/components/EditCaptionDialog.tsx      |  1 -
 .../sanity-plugin-shopify-assets/src/index.ts |  1 +
 .../src/configuration/utils/index.ts          |  1 +
 pnpm-lock.yaml                                |  2 +-
 pnpm-workspace.yaml                           |  2 +-
 32 files changed, 66 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/oxlint-1-86-suppressions.md
 create mode 100644 .changeset/plugin-kit-oxlint-1-86.md

diff --git a/.changeset/oxlint-1-86-suppressions.md b/.changeset/oxlint-1-86-suppressions.md
new file mode 100644
index 0000000000..ca8a5f2f54
--- /dev/null
+++ b/.changeset/oxlint-1-86-suppressions.md
@@ -0,0 +1,21 @@
+---
+'@sanity/assist': patch
+'@sanity/block-insert-picker': patch
+'@sanity/code-input': patch
+'@sanity/cross-dataset-duplicator': patch
+'@sanity/dashboard': patch
+'@sanity/document-internationalization': patch
+'@sanity/embeddings-index-ui': patch
+'@sanity/personalization-plugin': patch
+'@sanity/sfcc': patch
+'@sanity/themer': patch
+'sanity-naive-html-serializer': patch
+'sanity-plugin-internationalized-array': patch
+'sanity-plugin-markdown': patch
+'sanity-plugin-media': patch
+'sanity-plugin-mux-input': patch
+'sanity-plugin-shopify-assets': patch
+'sanity-translations-tab': patch
+---
+
+Update inline oxlint suppressions for the updated shared lint rules
diff --git a/.changeset/plugin-kit-oxlint-1-86.md b/.changeset/plugin-kit-oxlint-1-86.md
new file mode 100644
index 0000000000..b9dc25a23a
--- /dev/null
+++ b/.changeset/plugin-kit-oxlint-1-86.md
@@ -0,0 +1,5 @@
+---
+'@sanity/plugin-kit': patch
+---
+
+Require oxlint ^1.86.0, and ban `export *` barrel files that load over 100 modules (`oxc/no-barrel-file`) and the `styled-components` default import in the shared oxlint config
diff --git a/AGENTS.md b/AGENTS.md
index fd36117ec2..adf605a93b 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -230,7 +230,8 @@ Note on **knip**: in-file usage keeps an exported type "used" (`ignoreExportsUse
 
 ### Lint Specifics
 
-- **oxlint**: Type-aware linting with `--deny-warnings` (warnings are errors). React Compiler rules run natively via the [React Compiler vendored into oxlint](https://oxc.rs/blog/2026-08-18-react-compiler-support.html); the root `oxlint.config.ts` enables all of them (stricter than the plugin-kit preset) since this monorepo builds plugins with React Compiler.
+- **oxlint**: Type-aware linting with `--deny-warnings` (warnings are errors). React Compiler rules run natively via the [React Compiler vendored into oxlint](https://oxc.rs/blog/2026-08-18-react-compiler-support.html); the root `oxlint.config.ts` enables all of them (stricter than the plugin-kit preset) since this monorepo builds plugins with React Compiler, except `react/exhaustive-effect-dependencies`, which only checks effects and duplicates `react/exhaustive-deps`. Keep the `oxlint`/`oxlint-tsgolint` versions and the rules in line with sanity-io/ui.
+- **`oxc/no-barrel-file`** fails files whose `export *` re-exports load more than 100 modules, counting everything they import, type-only imports included. Prefer named re-exports (or `export type *` for modules that only export types); the existing `export *` entry points carry inline suppressions.
 - **TypeScript type checking** is included in `pnpm lint` via oxlint — no separate `tsc` needed
 - **stylelint** lints every `*.css` file (`pnpm lint:css`, part of `pnpm lint`) with the `@sanity/plugin-kit/stylelint` preset: `stylelint-config-recommended` plus `stylelint-config-css-modules`, formatting rules off since oxfmt owns formatting. The root `stylelint.config.mjs` imports and spreads the preset; it is `.mjs` on purpose, as stylelint loads `.ts` configs through the TypeScript compiler API that TypeScript 7 does not ship. stylelint 17 has no GitHub formatter, so the CI lint job registers `.github/problem-matchers/stylelint.json` to turn its default output into annotations.
 - Run `pnpm lint:fix` to auto-fix issues when possible (regenerates the CSS module typings, then stylelint and oxlint with `--fix`)
@@ -566,10 +567,10 @@ The oxfmt version, options and ignore patterns match sanity-io/ui's `.oxfmtrc.js
 
 Changesets are formatted like any other file, so their frontmatter uses single quotes, and Changesets formats the changesets it writes with oxfmt. Renovate's changeset action writes double quotes, so after a Renovate PR merges, the Auto format workflow opens a `chore(format): 🤖 ✨` PR that requotes it, as in sanity-io/ui.
 
-A lefthook pre-commit hook (`lefthook.yml`, set up like sanity-io/sanity's) runs oxfmt on the staged files and re-stages them. `pnpm install` installs the hook through lefthook's own install script, which `allowBuilds` in `pnpm-workspace.yaml` permits and which skips when `CI` is set. Skip the hook once with `LEFTHOOK=0 git commit`.
+A lefthook pre-commit hook (`lefthook.yml`, set up like sanity-io/sanity's) runs oxfmt on the staged files, then `oxlint --fix --quiet` on the staged scripts, and re-stages them; a lint error that `--fix` can't resolve blocks the commit. `pnpm install` installs the hook through lefthook's own install script, which `allowBuilds` in `pnpm-workspace.yaml` permits and which skips when `CI` is set. Skip the hook once with `LEFTHOOK=0 git commit`.
 
 - **Clones that ran husky:** they still have `core.hooksPath` set to `.husky/_`, and lefthook won't install there. Run `git config --unset core.hooksPath && pnpm install` once.
-- **Hook commands:** they call `node_modules/.bin/oxfmt` directly. `pnpm <bin>` in a hook runs pnpm 12's implicit install, which flips the peer toggle described under pnpm Version.
+- **Hook commands:** they call `node_modules/.bin/oxfmt` and `node_modules/.bin/oxlint` directly. `pnpm <bin>` in a hook runs pnpm 12's implicit install, which flips the peer toggle described under pnpm Version.
 - **Local scripts:** `pnpm --config.verify-deps-before-run=false <script>` avoids that implicit install too. Turbo tasks (`pnpm build`, the `pretest` build) run plain `pnpm run` in every package, so locally they trigger it as well, and that install is not frozen: it re-resolves the Studio `next` overrides (see `Lockfile re-resolution also moves the Studio next overrides`) and rewrites `pnpm-lock.yaml`. When the lockfile must stay put, run the package scripts through that flag instead, or export `pnpm_config_verify_deps_before_run=false` for the shell session—pnpm 12 reads `pnpm_config_*` environment variables (not `npm_config_*`), and the variable also reaches the nested `pnpm run` invocations inside turbo tasks that the CLI flag cannot. If it already happened, `git checkout pnpm-lock.yaml && pnpm install --frozen-lockfile` puts `node_modules` back on the locked versions.
 
 ### Linting
@@ -581,7 +582,7 @@ pnpm lint        # Run the linter (includes type checking)
 pnpm lint:fix    # Auto-fix what's possible
 ```
 
-The shared rules (plugins, options, categories, rules) live in the `@sanity/plugin-kit/oxlint` config (`packages/@sanity/plugin-kit/src/oxlint.ts`), which the root `oxlint.config.ts` extends; only workspace-specific ignores and overrides belong in the root config. Standalone plugins scaffolded with `plugin-kit init` re-export the same shared config. Note that `ignorePatterns` do not propagate through `extends`, so the root config spreads the shared patterns before adding its own. Like `pnpm format`, `pnpm lint` requires Node `>=22.18` to load the TypeScript config.
+The shared rules (plugins, options, categories, rules) live in the `@sanity/plugin-kit/oxlint` config (`packages/@sanity/plugin-kit/src/oxlint.ts`), which the root `oxlint.config.ts` extends; only workspace-specific ignores and overrides belong in the root config. Standalone plugins scaffolded with `plugin-kit init` re-export the same shared config. Note that `ignorePatterns` do not propagate through `extends`, so the root config spreads the shared patterns before adding its own. Like `pnpm format`, `pnpm lint` requires Node `>=22.18` to load the TypeScript config. The pre-commit hook lints staged scripts with the same config (see the lefthook notes under Formatting), so it needs that Node version too.
 
 ### CSS modules
 
diff --git a/lefthook.yml b/lefthook.yml
index f8025e8b17..d8b57d6ab4 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -3,10 +3,12 @@
 pre-commit:
   parallel: true
   jobs:
-    - name: format-scripts
+    - name: format-and-lint-scripts
       glob: '*.{js,jsx,ts,tsx,mjs,cjs,mts,cts}'
       stage_fixed: true
-      run: node_modules/.bin/oxfmt --no-error-on-unmatched-pattern {staged_files}
+      run: |
+        node_modules/.bin/oxfmt --no-error-on-unmatched-pattern {staged_files}
+        node_modules/.bin/oxlint --disable-nested-config --fix --quiet --no-error-on-unmatched-pattern {staged_files}
 
     - name: format-other
       glob: '*.{md,yml,yaml,css,json,jsonc}'
diff --git a/oxlint.config.ts b/oxlint.config.ts
index 25cefe8177..a7b229a856 100644
--- a/oxlint.config.ts
+++ b/oxlint.config.ts
@@ -26,10 +26,11 @@ export default defineConfig({
   ],
   rules: {
     // This monorepo builds plugins with React Compiler, so unlike the plugin-kit preset
-    // (which mostly relies on category defaults) every React Compiler rule is enabled:
+    // (which mostly relies on category defaults) every React Compiler rule is enabled
+    // except `react/exhaustive-effect-dependencies`, which only checks effects and
+    // duplicates the preset's `react/exhaustive-deps`:
     // https://oxc.rs/blog/2026-08-18-react-compiler-support.html#oxlint
     'react/capitalized-calls': 'error',
-    'react/exhaustive-effect-dependencies': 'error',
     'react/hooks': 'error',
     'react/invariant': 'error',
     'react/memo-dependencies': 'error',
diff --git a/packages/@sanity/plugin-kit/src/oxlint.ts b/packages/@sanity/plugin-kit/src/oxlint.ts
index c6434ca244..a18c82bef4 100644
--- a/packages/@sanity/plugin-kit/src/oxlint.ts
+++ b/packages/@sanity/plugin-kit/src/oxlint.ts
@@ -36,7 +36,7 @@ import type {OxlintConfig} from 'oxlint'
  * @public
  */
 const config: OxlintConfig = {
-  plugins: ['typescript', 'unicorn', 'react', 'oxc', 'import', 'jsx-a11y', 'promise'],
+  plugins: ['typescript', 'unicorn', 'react', 'react-perf', 'oxc', 'import', 'jsx-a11y', 'promise'],
   // oxlint resolves relative `jsPlugins` specifiers from the extending config, not from this
   // one, so hand it the plugin's absolute path.
   jsPlugins: [fileURLToPath(import.meta.resolve('@sanity/plugin-kit/oxlint-plugin'))],
@@ -74,6 +74,11 @@ const config: OxlintConfig = {
             message:
               'Use the official `@date-fns/tz` package (TZDate, tz, tzOffset) with date-fns v4 instead, matching sanity core.',
           },
+          {
+            name: 'styled-components',
+            importNames: ['default'],
+            message: 'Please use `import {styled} from "styled-components"` instead.',
+          },
           {
             name: 'react',
             importNames: ['createElement'],
@@ -126,6 +131,9 @@ const config: OxlintConfig = {
     'import/no-commonjs': 'error',
     'import/no-unassigned-import': ['error', {allow: ['**/*.css']}],
     'plugin-kit/no-css-module-default-import': 'error',
+    // Ban `export *` barrel files that pull in large module graphs; import
+    // directly from the module that defines a symbol instead
+    'oxc/no-barrel-file': 'error',
     'no-restricted-globals': [
       'error',
       {name: '__dirname', message: 'Use path.dirname(fileURLToPath(import.meta.url)) instead'},
diff --git a/plugins/@sanity/assist/src/_lib/form/index.ts b/plugins/@sanity/assist/src/_lib/form/index.ts
index ef01fb7a90..ddfdee84fe 100644
--- a/plugins/@sanity/assist/src/_lib/form/index.ts
+++ b/plugins/@sanity/assist/src/_lib/form/index.ts
@@ -1 +1,2 @@
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './DocumentForm'
diff --git a/plugins/@sanity/assist/src/assistDocument/components/AssistDocumentForm.tsx b/plugins/@sanity/assist/src/assistDocument/components/AssistDocumentForm.tsx
index 419fd9034a..9a30a7c77f 100644
--- a/plugins/@sanity/assist/src/assistDocument/components/AssistDocumentForm.tsx
+++ b/plugins/@sanity/assist/src/assistDocument/components/AssistDocumentForm.tsx
@@ -283,7 +283,6 @@ function FieldsInitializer({
     }
     onChange(event)
     initialized.current = true
-    // oxlint-disable-next-line react/exhaustive-effect-dependencies
   }, [activePath, onChange, pathKey, existingField, missingPresetInstructions])
 
   return null
diff --git a/plugins/@sanity/assist/src/assistDocument/hooks/useAssistDocumentContextValue.tsx b/plugins/@sanity/assist/src/assistDocument/hooks/useAssistDocumentContextValue.tsx
index db18951870..f6a85a1fc0 100644
--- a/plugins/@sanity/assist/src/assistDocument/hooks/useAssistDocumentContextValue.tsx
+++ b/plugins/@sanity/assist/src/assistDocument/hooks/useAssistDocumentContextValue.tsx
@@ -131,7 +131,6 @@ function useSyntheticTasks(assistableDocumentId: string) {
   useEffect(() => {
     // oxlint-disable-next-line react/set-state-in-effect
     setSyntheticTasks([])
-    // oxlint-disable-next-line react/exhaustive-effect-dependencies
   }, [assistableDocumentId])
 
   return {
diff --git a/plugins/@sanity/assist/src/index.ts b/plugins/@sanity/assist/src/index.ts
index 0b1245b757..d2ef2be01d 100644
--- a/plugins/@sanity/assist/src/index.ts
+++ b/plugins/@sanity/assist/src/index.ts
@@ -1,6 +1,7 @@
 import '@sanity/ui/styles.css'
 
 export {assist} from './plugin'
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './schemas/serialize/SchemTypeTool'
 export * from './schemas/typeDefExtensions'
 export {defaultLanguageOutputs} from './translate/paths'
diff --git a/plugins/@sanity/block-insert-picker/src/blockInsertPicker.tsx b/plugins/@sanity/block-insert-picker/src/blockInsertPicker.tsx
index 318bbeabdd..703f5ce2aa 100644
--- a/plugins/@sanity/block-insert-picker/src/blockInsertPicker.tsx
+++ b/plugins/@sanity/block-insert-picker/src/blockInsertPicker.tsx
@@ -518,7 +518,6 @@ export function BlockInsertPicker({
 
   useEffect(() => {
     highlightedRowRef.current?.scrollIntoView({block: 'nearest'})
-    // oxlint-disable-next-line react/exhaustive-effect-dependencies
   }, [highlightedIndex])
 
   // Stable virtual element derived from the captured rect — keeps Popover
diff --git a/plugins/@sanity/code-input/src/codemirror/CodeMirrorProxy.tsx b/plugins/@sanity/code-input/src/codemirror/CodeMirrorProxy.tsx
index a20a2ab52f..4aa3d12cdc 100644
--- a/plugins/@sanity/code-input/src/codemirror/CodeMirrorProxy.tsx
+++ b/plugins/@sanity/code-input/src/codemirror/CodeMirrorProxy.tsx
@@ -73,7 +73,6 @@ function CodeMirrorProxy(props: CodeMirrorProps & {ref?: Ref<ReactCodeMirrorRef>
     if (editorView) {
       setHighlightedLines(editorView, highlightLines ?? [])
     }
-    // oxlint-disable-next-line react/exhaustive-effect-dependencies
   }, [editorView, highlightLines, value])
 
   const [initialState] = useState(() => {
diff --git a/plugins/@sanity/cross-dataset-duplicator/src/index.ts b/plugins/@sanity/cross-dataset-duplicator/src/index.ts
index cd9ef9e7d1..4a6327b94f 100644
--- a/plugins/@sanity/cross-dataset-duplicator/src/index.ts
+++ b/plugins/@sanity/cross-dataset-duplicator/src/index.ts
@@ -1,5 +1,6 @@
 import '@sanity/ui/styles.css'
 
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './types'
 export * from './plugin'
 export * from './actions/DuplicateToAction'
diff --git a/plugins/@sanity/dashboard/src/index.ts b/plugins/@sanity/dashboard/src/index.ts
index bca868f2c0..931b397ec4 100644
--- a/plugins/@sanity/dashboard/src/index.ts
+++ b/plugins/@sanity/dashboard/src/index.ts
@@ -1,5 +1,6 @@
 import '@sanity/ui/styles.css'
 
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './types'
 export * from './components/DashboardWidgetContainer'
 export * from './widgets/projectInfo'
diff --git a/plugins/@sanity/document-internationalization/src/index.ts b/plugins/@sanity/document-internationalization/src/index.ts
index 25729e2302..98d1bf2e52 100644
--- a/plugins/@sanity/document-internationalization/src/index.ts
+++ b/plugins/@sanity/document-internationalization/src/index.ts
@@ -13,4 +13,5 @@ export {
 export {useDocumentInternationalizationContext} from './components/DocumentInternationalizationContext'
 export {DocumentInternationalizationMenu} from './components/DocumentInternationalizationMenu'
 export {documentInternationalization} from './plugin'
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './types'
diff --git a/plugins/@sanity/embeddings-index-ui/src/index.ts b/plugins/@sanity/embeddings-index-ui/src/index.ts
index 4e6b194fdd..e8fe3fcdb6 100644
--- a/plugins/@sanity/embeddings-index-ui/src/index.ts
+++ b/plugins/@sanity/embeddings-index-ui/src/index.ts
@@ -8,4 +8,5 @@ export {embeddingsIndexReferenceInput}
 
 export {embeddingsIndexDashboard}
 
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './api/embeddingsApi'
diff --git a/plugins/@sanity/personalization-plugin/src/components/experiment/index.ts b/plugins/@sanity/personalization-plugin/src/components/experiment/index.ts
index 1c5bc32cd6..b918e5fbe2 100644
--- a/plugins/@sanity/personalization-plugin/src/components/experiment/index.ts
+++ b/plugins/@sanity/personalization-plugin/src/components/experiment/index.ts
@@ -1,3 +1,4 @@
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './Array'
 export * from './Context'
 export * from './Field'
diff --git a/plugins/@sanity/personalization-plugin/src/components/personalization/index.ts b/plugins/@sanity/personalization-plugin/src/components/personalization/index.ts
index edd260a782..7a30611dc0 100644
--- a/plugins/@sanity/personalization-plugin/src/components/personalization/index.ts
+++ b/plugins/@sanity/personalization-plugin/src/components/personalization/index.ts
@@ -1,3 +1,4 @@
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './Array'
 export * from './Context'
 export * from './Field'
diff --git a/plugins/@sanity/personalization-plugin/src/index.ts b/plugins/@sanity/personalization-plugin/src/index.ts
index 361bc799b7..c6f3d8657f 100644
--- a/plugins/@sanity/personalization-plugin/src/index.ts
+++ b/plugins/@sanity/personalization-plugin/src/index.ts
@@ -1,5 +1,6 @@
 import '@sanity/ui/styles.css'
 
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './fieldExperiments'
 export * from './fieldPersonalization'
 export * from './types'
diff --git a/plugins/@sanity/sfcc/src/structure/index.ts b/plugins/@sanity/sfcc/src/structure/index.ts
index bab75d82d8..4e0e74f332 100644
--- a/plugins/@sanity/sfcc/src/structure/index.ts
+++ b/plugins/@sanity/sfcc/src/structure/index.ts
@@ -10,5 +10,6 @@ export function defineStructure<StructureType>(
   return factory
 }
 
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './categoryStructure'
 export * from './productStructure'
diff --git a/plugins/@sanity/themer/src/tool/ImagePaletteSection.tsx b/plugins/@sanity/themer/src/tool/ImagePaletteSection.tsx
index cadbdeae6b..f5135121e0 100644
--- a/plugins/@sanity/themer/src/tool/ImagePaletteSection.tsx
+++ b/plugins/@sanity/themer/src/tool/ImagePaletteSection.tsx
@@ -100,7 +100,6 @@ export function ImagePaletteSection(props: {
     observer.observe(row)
 
     return () => observer.disconnect()
-    // oxlint-disable-next-line react/exhaustive-effect-dependencies -- the row only renders with a palette, so a new palette has a new row to observe
   }, [palette])
 
   const variantRowStyle: VariantRowStyle = {
diff --git a/plugins/sanity-naive-html-serializer/src/BaseDocumentDeserializer/index.ts b/plugins/sanity-naive-html-serializer/src/BaseDocumentDeserializer/index.ts
index fd64ad43e8..15cf57369d 100644
--- a/plugins/sanity-naive-html-serializer/src/BaseDocumentDeserializer/index.ts
+++ b/plugins/sanity-naive-html-serializer/src/BaseDocumentDeserializer/index.ts
@@ -1 +1,2 @@
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './BaseDocumentDeserializer'
diff --git a/plugins/sanity-plugin-internationalized-array/migrations/index.ts b/plugins/sanity-plugin-internationalized-array/migrations/index.ts
index b4c5638281..8173b356b2 100644
--- a/plugins/sanity-plugin-internationalized-array/migrations/index.ts
+++ b/plugins/sanity-plugin-internationalized-array/migrations/index.ts
@@ -1 +1,2 @@
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './migrateToLanguageField'
diff --git a/plugins/sanity-plugin-internationalized-array/src/index.ts b/plugins/sanity-plugin-internationalized-array/src/index.ts
index a831a2c3bb..a4384faa8e 100644
--- a/plugins/sanity-plugin-internationalized-array/src/index.ts
+++ b/plugins/sanity-plugin-internationalized-array/src/index.ts
@@ -3,5 +3,6 @@ import '@sanity/ui/styles.css'
 export {clear} from './cache'
 export {LANGUAGE_FIELD_NAME} from './constants'
 export {internationalizedArray} from './plugin'
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './types'
 export {internationalizedArrayLanguageFilter} from './utils/internationalizedArrayLanguageFilter'
diff --git a/plugins/sanity-plugin-markdown/src/index.ts b/plugins/sanity-plugin-markdown/src/index.ts
index 5079064ea8..2b0c32ebb0 100644
--- a/plugins/sanity-plugin-markdown/src/index.ts
+++ b/plugins/sanity-plugin-markdown/src/index.ts
@@ -2,4 +2,5 @@ import '@sanity/ui/styles.css'
 // @ts-expect-error - fix the missing typings later
 import 'easymde/dist/easymde.min.css'
 
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './commonExports'
diff --git a/plugins/sanity-plugin-markdown/src/indexNext.ts b/plugins/sanity-plugin-markdown/src/indexNext.ts
index 03fd594ed5..14face6dd2 100644
--- a/plugins/sanity-plugin-markdown/src/indexNext.ts
+++ b/plugins/sanity-plugin-markdown/src/indexNext.ts
@@ -1,3 +1,4 @@
 import '@sanity/ui/styles.css'
 
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './commonExports'
diff --git a/plugins/sanity-plugin-media/src/components/Browser/useBrowserInit.ts b/plugins/sanity-plugin-media/src/components/Browser/useBrowserInit.ts
index 07507ae94b..3375f5ff54 100644
--- a/plugins/sanity-plugin-media/src/components/Browser/useBrowserInit.ts
+++ b/plugins/sanity-plugin-media/src/components/Browser/useBrowserInit.ts
@@ -140,6 +140,5 @@ export function useBrowserInit(
         }),
       )
     }
-    // oxlint-disable-next-line react/exhaustive-effect-dependencies
   }, [tagsFetchCount, hasMediaTags]) // eslint-disable-line react-hooks/exhaustive-deps
 }
diff --git a/plugins/sanity-plugin-mux-input/src/components/EditCaptionDialog.tsx b/plugins/sanity-plugin-mux-input/src/components/EditCaptionDialog.tsx
index 9512b65e6a..91dfd12fa2 100644
--- a/plugins/sanity-plugin-mux-input/src/components/EditCaptionDialog.tsx
+++ b/plugins/sanity-plugin-mux-input/src/components/EditCaptionDialog.tsx
@@ -71,7 +71,6 @@ export default function EditCaptionDialog({asset, track, onUpdate, onClose}: Pro
     )
     const foundByName = track.name ? LANGUAGE_OPTIONS.find((opt) => opt.label === track.name) : null
     setSelectedLanguage(foundByCode || foundByName || null)
-    // oxlint-disable-next-line react/exhaustive-effect-dependencies
   }, [track, asset, client])
 
   const handleDownloadCurrentFile = async () => {
diff --git a/plugins/sanity-plugin-shopify-assets/src/index.ts b/plugins/sanity-plugin-shopify-assets/src/index.ts
index 4cddc81cf5..ca4a4d923d 100644
--- a/plugins/sanity-plugin-shopify-assets/src/index.ts
+++ b/plugins/sanity-plugin-shopify-assets/src/index.ts
@@ -6,6 +6,7 @@ import {shopifyAssetPreviewSchema} from './schema/shopifyAssetPreviewSchema'
 import {shopifyAssetSchema} from './schema/shopifyAssetSchema'
 import type {PluginConfig} from './types'
 
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './types'
 
 // enables autocompletion and validation of document options
diff --git a/plugins/sanity-translations-tab/src/configuration/utils/index.ts b/plugins/sanity-translations-tab/src/configuration/utils/index.ts
index 2cbc4c8b20..2eabac9566 100644
--- a/plugins/sanity-translations-tab/src/configuration/utils/index.ts
+++ b/plugins/sanity-translations-tab/src/configuration/utils/index.ts
@@ -1,2 +1,3 @@
+// oxlint-disable-next-line oxc/no-barrel-file
 export * from './findDocumentAtRevision'
 export * from './findLatestDraft'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b9bb6f8e03..9a5bb4e722 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -289,7 +289,7 @@ catalogs:
       specifier: ^0.73.0
       version: 0.73.0
     oxlint:
-      specifier: ^1.83.0
+      specifier: ^1.86.0
       version: 1.86.0
     oxlint-tsgolint:
       specifier: ^7.0.2003
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index f39615c73c..54cb82cdf7 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -71,7 +71,7 @@ catalog:
   nanoid: ^6.0.2
   oxc-transform-react: ^0.154.0
   oxfmt: ^0.73.0
-  oxlint: ^1.83.0
+  oxlint: ^1.86.0
   oxlint-tsgolint: ^7.0.2003
   react: ^19.3.1
   react-dom: ^19.3.1