@petbee/eslint-config 1.0.17 → 2.0.0

package/README.md

@@ -23,7 +23,7 @@ yarn add -D @petbee/eslint-config typescript prettier
 
 ### For ESLint v9.x (flat config)
 
-```javascript
+```js
 // eslint.config.js
 import petbeeConfig from '@petbee/eslint-config'
 

package/eslint.config.mjs

@@ -13,36 +13,17 @@ import importsConfig from './rules/imports.js'
 import typescriptConfig from './rules/typescript.js'
 import testsConfig from './rules/tests.js'
 
-// Helper function to ensure configs are in the correct format for spreading
-const ensureArray = (config) => {
-  if (!config) return []
-  if (Array.isArray(config)) return config
-  
-  // Convert legacy config format to flat config format
-  if (config.rules || config.extends || config.plugins) {
-    const flatConfig = { ...config }
-    
-    // Convert env to languageOptions.globals
-    if (flatConfig.env) {
-      flatConfig.languageOptions = flatConfig.languageOptions || {}
-      flatConfig.languageOptions.globals = flatConfig.languageOptions.globals || {}
-      
-      // Map common environments to globals
-      if (flatConfig.env.node) Object.assign(flatConfig.languageOptions.globals, globals.node)
-      if (flatConfig.env.jest) Object.assign(flatConfig.languageOptions.globals, globals.jest)
-      if (flatConfig.env.es6) Object.assign(flatConfig.languageOptions.globals, globals.es2015)
-      
-      // Remove the env property
-      delete flatConfig.env
-    }
-    
-    return [flatConfig]
-  }
+const ignoreConfig = {
+  ignores: ['node_modules/', 'coverage/', 'dist/'],
+}
 
-  return []
+// Helper to get the flat config if available, otherwise fallback
+const getFlat = (config) => {
+  return config && config.flat ? (Array.isArray(config.flat) ? config.flat : [config.flat]) : []
 }
 
 export default [
+  ignoreConfig,
   js.configs.recommended,
   {
     files: ['**/*.ts', '**/*.tsx'],
@@ -57,20 +38,20 @@ export default [
         ...globals.jest,
         ...globals.es2015,
         __DEV__: true,
-      }
+      },
     },
     plugins: {
       '@typescript-eslint': tsPlugin,
     },
     settings: {},
   },
-  ...ensureArray(prettierConfig),
-  ...ensureArray(errorsConfig),
-  ...ensureArray(nodeConfig),
-  ...ensureArray(styleConfig),
-  ...ensureArray(variablesConfig),
-  ...ensureArray(bestPracticesConfig),
-  ...ensureArray(importsConfig),
-  ...ensureArray(typescriptConfig),
-  ...ensureArray(testsConfig),
+  ...getFlat(prettierConfig),
+  ...getFlat(errorsConfig),
+  ...getFlat(nodeConfig),
+  ...getFlat(styleConfig),
+  ...getFlat(variablesConfig),
+  ...getFlat(bestPracticesConfig),
+  ...getFlat(importsConfig),
+  ...getFlat(typescriptConfig),
+  ...getFlat(testsConfig),
 ]

package/lib/utils.js

@@ -1,4 +1,4 @@
-/* eslint-disable node/global-require */
+/* eslint-disable n/global-require */
 
 exports.hasPackage = (pkg) => {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@petbee/eslint-config",
-  "version": "1.0.17",
+  "version": "2.0.0",
   "description": "Petbee's eslint config",
   "keywords": [
     "eslint",
@@ -38,33 +38,31 @@
     "url": "https://github.com/petbee/typescript/issues"
   },
   "dependencies": {
-    "@eslint/js": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.15.0",
-    "@typescript-eslint/parser": "^5.15.0",
+    "@typescript-eslint/eslint-plugin": "^8.32.1",
+    "@typescript-eslint/parser": "^8.32.1",
     "confusing-browser-globals": "^1.0.11",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-cypress": "^2.15.1",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-jest": "^27.6.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^5.0.1",
-    "eslint-plugin-react": "7.33.2",
-    "globals": "^13.24.0"
+    "eslint-config-prettier": "^10.1.5",
+    "eslint-plugin-cypress": "^4.3.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jest": "^28.11.0",
+    "eslint-plugin-n": "^17.18.0",
+    "eslint-plugin-prettier": "^5.4.0",
+    "eslint-plugin-react": "7.37.5"
   },
   "peerDependencies": {
-    "eslint": ">=5.0.0",
-    "prettier": ">=2.4",
+    "eslint": ">=9.0.0",
+    "prettier": ">=3.0.0",
     "typescript": "^4.0.0 || ^5.0.0"
   },
   "devDependencies": {
-    "@types/react": "18.2.37",
-    "eslint": "8.53.0",
-    "prettier": "3.0.3",
-    "react": "18.2.0",
-    "typescript": "5.2.2"
+    "@types/react": "19.1.4",
+    "eslint": "9.27.0",
+    "prettier": "3.5.3",
+    "react": "19.1.0",
+    "typescript": "5.8.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "60105fc255d4bdf8c41303eda54123b70cacc52c"
+  "gitHead": "16e717a08300a1d7afc9e0b0fe28642d7b61b752"
 }

package/rules/imports.js

@@ -46,3 +46,11 @@ module.exports = {
     'import/no-self-import': 'error',
   },
 }
+
+// Flat config for ESLint v9 (no extends, plugins as object)
+module.exports.flat = {
+  plugins: {
+    import: require('eslint-plugin-import'),
+  },
+  rules: module.exports.rules,
+}

package/rules/node.js

@@ -5,38 +5,38 @@ module.exports = {
   },
   rules: {
     // Disallow use of process.env
-    // https://github.com/mysticatea/eslint-plugin-node/blob/master/docs/rules/no-process-env.md
-    'node/no-process-env': 'off',
+    // https://github.com/eslint-community/eslint-plugin-n/blob/master/docs/rules/no-process-env.md
+    'n/no-process-env': 'off',
 
     // Enforce a callback to return
-    // https://github.com/mysticatea/eslint-plugin-node/blob/master/docs/rules/callback-return.md
+    // https://github.com/eslint-community/eslint-plugin-n/blob/master/docs/rules/callback-return.md
     //! too annoying
-    'node/callback-return': 'off',
+    'n/callback-return': 'off',
 
     // Require all requires be top-level
-    // https://github.com/mysticatea/eslint-plugin-node/blob/master/docs/rules/global-require.md
-    'node/global-require': 'error',
+    // https://github.com/eslint-community/eslint-plugin-n/blob/master/docs/rules/global-require.md
+    'n/global-require': 'error',
 
     // Disallow use of new operator with the require function
-    // https://github.com/mysticatea/eslint-plugin-node/blob/master/docs/rules/no-new-require.md
-    'node/no-new-require': 'error',
+    // https://github.com/eslint-community/eslint-plugin-n/blob/master/docs/rules/no-new-require.md
+    'n/no-new-require': 'error',
 
     // Disallow string concatenation with __dirname and __filename
-    // https://github.com/mysticatea/eslint-plugin-node/blob/master/docs/rules/no-path-concat.md
-    'node/no-path-concat': 'error',
+    // https://github.com/eslint-community/eslint-plugin-n/blob/master/docs/rules/no-path-concat.md
+    'n/no-path-concat': 'error',
 
     // Make process.exit() expressions the same code path as throw
-    // https://github.com/mysticatea/eslint-plugin-node/blob/master/docs/rules/process-exit-as-throw.md
-    'node/process-exit-as-throw': 'error',
+    // https://github.com/eslint-community/eslint-plugin-n/blob/master/docs/rules/process-exit-as-throw.md
+    'n/process-exit-as-throw': 'error',
 
     // Disallow deprecated APIs
-    // https://github.com/mysticatea/eslint-plugin-node/blob/master/docs/rules/no-deprecated-api.md
-    'node/no-deprecated-api': 'error',
+    // https://github.com/eslint-community/eslint-plugin-n/blob/master/docs/rules/no-deprecated-api.md
+    'n/no-deprecated-api': 'error',
 
     // Encourages use of promise APIs instead o callback APIs
-    // https://github.com/mysticatea/eslint-plugin-node/blob/master/docs/rules/prefer-promises/fs.md
-    // https://github.com/mysticatea/eslint-plugin-node/blob/master/docs/rules/prefer-promises/dns.md
-    'node/prefer-promises/fs': 'warn',
-    'node/prefer-promises/dns': 'warn',
+    // https://github.com/eslint-community/eslint-plugin-n/blob/master/docs/rules/prefer-promises/fs.md
+    // https://github.com/eslint-community/eslint-plugin-n/blob/master/docs/rules/prefer-promises/dns.md
+    'n/prefer-promises/fs': 'warn',
+    'n/prefer-promises/dns': 'warn',
   },
 }

package/rules/prettier.js

@@ -6,3 +6,11 @@ module.exports = {
     'prettier/prettier': 'error',
   },
 }
+
+// Flat config for ESLint v9 (no extends, plugins as object)
+module.exports.flat = {
+  plugins: {
+    prettier: require('eslint-plugin-prettier'),
+  },
+  rules: module.exports.rules,
+}

package/rules/tests.js

@@ -63,3 +63,22 @@ module.exports = {
     },
   ],
 }
+
+// Flat config for ESLint v9 (no extends, plugins as object)
+module.exports.flat = [
+  {
+    files: module.exports.overrides[0].files,
+    plugins: {
+      cypress: require('eslint-plugin-cypress'),
+    },
+    rules: module.exports.overrides[0].rules,
+  },
+  {
+    files: module.exports.overrides[1].files,
+    excludedFiles: module.exports.overrides[1].excludedFiles,
+    plugins: {
+      jest: require('eslint-plugin-jest'),
+    },
+    rules: module.exports.overrides[1].rules,
+  },
+]

package/rules/typescript.js

@@ -279,3 +279,25 @@ module.exports = hasTypescript
       ],
     }
   : {}
+
+// Flat config for ESLint v9 (no extends, plugins as object)
+if (hasTypescript) {
+  const overrides = module.exports.overrides || []
+  module.exports.flat = [
+    {
+      files: overrides[0]?.files,
+      languageOptions: {
+        parser: require.resolve('@typescript-eslint/parser'),
+        parserOptions: overrides[0]?.parserOptions,
+      },
+      plugins: {
+        '@typescript-eslint': require('@typescript-eslint/eslint-plugin'),
+      },
+      rules: overrides[0]?.rules,
+    },
+    {
+      files: overrides[1]?.files,
+      rules: overrides[1]?.rules,
+    },
+  ]
+}