diff --git a/eslint-configs/eslint-config-seekingalpha-base/CHANGELOG.md b/eslint-configs/eslint-config-seekingalpha-base/CHANGELOG.md index 4b939006..4369eefb 100644 --- a/eslint-configs/eslint-config-seekingalpha-base/CHANGELOG.md +++ b/eslint-configs/eslint-config-seekingalpha-base/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 11.39.0 - 2025-12-30 + +- [breaking] drop `eslint-plugin-promise` from oxlint config + ## 11.38.0 - 2025-12-27 - [new] extend sharable oxlint config with eslint-plugin-import rules diff --git a/eslint-configs/eslint-config-seekingalpha-base/oxc.js b/eslint-configs/eslint-config-seekingalpha-base/oxc.js index b687b836..0e23bc6b 100644 --- a/eslint-configs/eslint-config-seekingalpha-base/oxc.js +++ b/eslint-configs/eslint-config-seekingalpha-base/oxc.js @@ -1,19 +1,29 @@ +import esLintConfig from './rules/eslint/index.js'; +import esLintPluginImport from './rules/eslint-plugin-import/index.js'; +import esLintPluginUnicorn from './rules/eslint-plugin-unicorn/index.js'; import { ESLintDisabled } from './rules/eslint/oxlint-disabled.js'; import { ESLintPluginPromiseDisabled } from './rules/eslint-plugin-promise/oxlint-disabled.js'; import { ESLintPluginUnicornDisabled } from './rules/eslint-plugin-unicorn/oxlint-disabled.js'; import { ESLintPluginImportDisabled } from './rules/eslint-plugin-import/oxlint-disabled.js'; -import config from './index.js'; - const oxcConfig = { - ...config, + plugins: { + ...esLintPluginImport.plugins, + ...esLintPluginUnicorn.plugins, + }, rules: { - ...config.rules, + ...esLintConfig.rules, + ...esLintPluginImport.rules, + ...esLintPluginUnicorn.rules, + // Disabled rules for OXC projects ...ESLintDisabled, ...ESLintPluginImportDisabled, ...ESLintPluginPromiseDisabled, ...ESLintPluginUnicornDisabled, }, + settings: { + ...esLintPluginImport.settings, + }, }; export default oxcConfig; diff --git a/eslint-configs/eslint-config-seekingalpha-base/package.json b/eslint-configs/eslint-config-seekingalpha-base/package.json index 2d518c80..295395f1 100644 --- a/eslint-configs/eslint-config-seekingalpha-base/package.json +++ b/eslint-configs/eslint-config-seekingalpha-base/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-seekingalpha-base", - "version": "11.38.0", + "version": "11.39.0", "description": "SeekingAlpha's sharable base ESLint config", "main": "index.js", "type": "module", diff --git a/package.json b/package.json index a98631fe..4b0abedd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "seekingalpha-javascript-style", - "version": "9.86.0", + "version": "9.87.0", "description": "Set of linting rules, guides and best practices for best Javascript code", "main": "index.js", "type": "module",