@egs33/eslint-config 1.13.0 → 2.0.2

package/README.md

@@ -15,18 +15,20 @@ $ yarn add -D eslint @egs33/eslint-config
 ## Usage
 ### for node.js
 ```javascript
-module.exports = {
-  root: true,
-  extends: '@egs33',
-};
+import node from '@egs33/eslint-config/nodejs.js';
+
+export default [
+  ...node,
+];
 ```
 
 ### for browser
 ```javascript
-module.exports = {
-  root: true,
-  extends: '@egs33/eslint-config/browser',
-};
+import browser from '@egs33/eslint-config/browser.js';
+
+export default [
+  ...browser,
+];
 ```
 
 ### for browser and Vue.js SFC
@@ -35,11 +37,12 @@ $ yarn add -D vue-eslint-parser eslint-plugin-vue
 ```
 
 ```javascript
-module.exports = {
-  root: true,
-  extends: '@egs33/eslint-config/vue3',
-  parser: 'vue-eslint-parser',
-};
+import vue3 from '@egs33/eslint-config/vue3.js';
+import { applyConfig } from '@egs33/eslint-config/util.js';
+
+export default [
+  ...applyConfig({ files: ['**/*.vue'] }, vue3),
+];
 ```
 ### for node.js (typescript)
 ```bash
@@ -47,17 +50,10 @@ $ yarn add -D @typescript-eslint/eslint-plugin
 ```
 
 ```javascript
-module.exports = {
-  root: true,
-  extends: '@egs33',
-  overrides: [
-    {
-      files: '*.ts',
-      extends: '@egs33/eslint-config/typescript-node',
-      parserOptions: {
-        project: './tsconfig.json',
-      },
-    },
-  ],
-};
+import tsNode from '@egs33/eslint-config/typescript-node.js';
+import { applyConfig } from '@egs33/eslint-config/util.js';
+
+export default [
+  ...applyConfig({ files: ['**/*.ts'] }, tsNode),
+];
 ```

package/base.js

@@ -1,29 +1,48 @@
-const promiseRules = require('./plugin-rules/promise');
+import { FlatCompat } from '@eslint/eslintrc';
+import promise from 'eslint-plugin-promise';
+import { rules as PromiseRules } from './plugin-rules/promise.js';
 
-module.exports = {
-  extends: [
-    'airbnb-base',
-    'plugin:array-func/all',
-    'plugin:regexp/recommended',
-  ],
-  parserOptions: {
-    ecmaVersion: 2021,
-  },
-  env: {
-    es2020: true,
+const compat = new FlatCompat();
+
+export default [
+  {
+    languageOptions: {
+      ecmaVersion: 2023,
+      parserOptions: {
+        // avoid import plugin error
+        ecmaVersion: 2023,
+      },
+    },
+    plugins: { promise },
+    linterOptions: {
+      reportUnusedDisableDirectives: true,
+    },
+    settings: {
+      'import/parsers': {
+        espree: ['.js', '.cjs', '.mjs', '.jsx'],
+      },
+    },
   },
-  plugins: ['promise', 'array-func', 'regexp'],
-  rules: {
-    'no-plusplus': 'off',
-    'no-continue': 'off',
-    'func-style': 'error',
-    'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
-    'import/prefer-default-export': 'off',
-    'import/no-default-export': 'error',
-    'max-lines': ['error', { max: 500, skipComments: true }],
-    // https://github.com/airbnb/javascript/blob/master/packages/eslint-config-airbnb-base/rules/style.js#L6
-    'array-bracket-newline': 'error',
-    ...promiseRules,
-    'array-func/prefer-array-from': 'off',
+  ...compat.extends('eslint-config-airbnb-base'),
+  ...compat.extends('plugin:eslint-plugin-array-func/all'),
+  ...compat.extends('plugin:eslint-plugin-regexp/recommended'),
+  {
+    languageOptions: {
+      // overwrite plugin-array-func
+      ecmaVersion: 2023,
+    },
+    rules: {
+      'no-plusplus': 'off',
+      'no-continue': 'off',
+      'func-style': 'error',
+      'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
+      'import/prefer-default-export': 'off',
+      'import/no-default-export': 'error',
+      'max-lines': ['error', { max: 500, skipComments: true }],
+      // https://github.com/airbnb/javascript/blob/master/packages/eslint-config-airbnb-base/rules/style.js#L6
+      'array-bracket-newline': 'error',
+      'array-func/prefer-array-from': 'off',
+      ...PromiseRules,
+    },
   },
-};
+];

package/browser.js

@@ -1,6 +1,13 @@
-module.exports = {
-  extends: './base',
-  env: {
-    browser: true,
+import globals from 'globals';
+import base from './base.js';
+
+export default [
+  ...base,
+  {
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+      },
+    },
   },
-};
+];

package/nodejs.js

@@ -1,19 +1,23 @@
-module.exports = {
-  extends: [
-    './base',
-    'plugin:n/recommended',
-  ],
-  parserOptions: {
-    ecmaVersion: 2021,
+import node from 'eslint-plugin-n/configs/recommended-module.js';
+import globals from 'globals';
+import base from './base.js';
+
+export default [
+  ...base,
+  node,
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+    },
+    rules: {
+      'n/no-path-concat': 'error',
+      'n/prefer-global/buffer': 'error',
+      'n/prefer-global/console': 'error',
+      'n/prefer-global/url': 'error',
+      'n/prefer-global/url-search-params': 'error',
+      'import/extensions': ['error', 'always', { ignorePackages: true }],
+    },
   },
-  env: {
-    node: true,
-  },
-  rules: {
-    'n/no-path-concat': 'error',
-    'n/prefer-global/buffer': 'error',
-    'n/prefer-global/console': 'error',
-    'n/prefer-global/url': 'error',
-    'n/prefer-global/url-search-params': 'error',
-  },
-};
+];

package/package.json

@@ -1,21 +1,24 @@
 {
   "name": "@egs33/eslint-config",
   "description": "eslint config for me",
-  "version": "1.13.0",
+  "version": "2.0.2",
   "author": "egs33",
+  "type": "module",
   "dependencies": {
+    "@eslint/eslintrc": "^2.0.3",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-plugin-array-func": "^3.1.7",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-n": "^15.6.1",
+    "eslint-plugin-n": "^16.0.1",
     "eslint-plugin-promise": "^6.0.1",
-    "eslint-plugin-regexp": "^1.9.0"
+    "eslint-plugin-regexp": "^1.9.0",
+    "globals": "^13.20.0"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.56.0",
     "@typescript-eslint/parser": "^5.56.0",
-    "eslint": "^8.23.1",
+    "eslint": "^8.44.0",
     "eslint-plugin-vue": "^9.5.0",
     "typescript": "^5.0.2",
     "vue-eslint-parser": "^9.1.0"
@@ -24,10 +27,10 @@
     "node": ">=16"
   },
   "files": [
+    "util.js",
     "base.js",
     "browser.js",
     "nodejs.js",
-    "vue.js",
     "vue3.js",
     "typescript-base.js",
     "typescript-node.js",
@@ -43,7 +46,7 @@
   "main": "nodejs.js",
   "peerDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.37.0",
-    "eslint": "^8.23.1",
+    "eslint": "^8.44.0",
     "eslint-plugin-vue": "^9.5.0",
     "typescript": ">=4.4.4",
     "vue-eslint-parser": "^9.1.0"
@@ -67,7 +70,7 @@
     "url": "https://github.com/egs33/eslint-config"
   },
   "scripts": {
-    "lint": "eslint . -c base.js",
-    "lint:fix": "eslint . -c base.js --fix"
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   }
 }

package/plugin-rules/promise.js

@@ -1,4 +1,4 @@
-module.exports = {
+export const rules = {
   'promise/always-return': 'off',
   'promise/no-return-wrap': 'error',
   'promise/param-names': 'error',

package/typescript-base.js

@@ -1,25 +1,35 @@
-const base = require('./base');
+import { FlatCompat } from '@eslint/eslintrc';
+import base from './base.js';
 
-module.exports = {
-  extends: [
-    'plugin:@typescript-eslint/recommended',
-    'plugin:@typescript-eslint/recommended-requiring-type-checking',
-    'airbnb-typescript/base',
-  ],
-  rules: {
-    ...base.rules,
-    '@typescript-eslint/method-signature-style': ['error', 'property'],
-    '@typescript-eslint/restrict-template-expressions': 'off',
-    '@typescript-eslint/consistent-type-imports': 'error',
-    '@typescript-eslint/array-type': 'error',
-    '@typescript-eslint/no-invalid-void-type': 'error',
-    '@typescript-eslint/no-require-imports': 'error',
-    '@typescript-eslint/non-nullable-type-assertion-style': 'error',
-    '@typescript-eslint/prefer-for-of': 'error',
-    '@typescript-eslint/prefer-includes': 'error',
-    '@typescript-eslint/prefer-optional-chain': 'error',
-    '@typescript-eslint/prefer-nullish-coalescing': 'error',
-    '@typescript-eslint/prefer-string-starts-ends-with': 'error',
-    '@typescript-eslint/type-annotation-spacing': 'error',
+const compat = new FlatCompat();
+
+const a = [
+  ...base,
+  ...compat.extends('plugin:@typescript-eslint/recommended'),
+  ...compat.extends('plugin:@typescript-eslint/recommended-requiring-type-checking'),
+  ...compat.extends('airbnb-typescript/base'),
+  {
+    languageOptions: {
+      parserOptions: {
+        project: './tsconfig.json',
+      },
+    },
+    rules: {
+      '@typescript-eslint/method-signature-style': ['error', 'property'],
+      '@typescript-eslint/restrict-template-expressions': 'off',
+      '@typescript-eslint/consistent-type-imports': 'error',
+      '@typescript-eslint/array-type': 'error',
+      '@typescript-eslint/no-invalid-void-type': 'error',
+      '@typescript-eslint/no-require-imports': 'error',
+      '@typescript-eslint/non-nullable-type-assertion-style': 'error',
+      '@typescript-eslint/prefer-for-of': 'error',
+      '@typescript-eslint/prefer-includes': 'error',
+      '@typescript-eslint/prefer-optional-chain': 'error',
+      '@typescript-eslint/prefer-nullish-coalescing': 'error',
+      '@typescript-eslint/prefer-string-starts-ends-with': 'error',
+      '@typescript-eslint/type-annotation-spacing': 'error',
+    },
   },
-};
+];
+
+export default a;

package/typescript-browser.js

@@ -1,6 +1,7 @@
-module.exports = {
-  extends: [
-    './browser',
-    './typescript-base',
-  ],
-};
+import browser from './browser.js';
+import typescriptBase from './typescript-base.js';
+
+export default [
+  ...browser,
+  ...typescriptBase,
+];

package/typescript-node.js

@@ -1,9 +1,12 @@
-module.exports = {
-  extends: [
-    './nodejs',
-    './typescript-base',
-  ],
-  rules: {
-    'n/no-missing-import': 'off',
+import nodejs from './nodejs.js';
+import typescriptBase from './typescript-base.js';
+
+export default [
+  ...nodejs,
+  ...typescriptBase,
+  {
+    rules: {
+      'n/no-missing-import': 'off',
+    },
   },
-};
+];

package/util.js

@@ -0,0 +1,10 @@
+/**
+ * @param {{files?: string[], ignores?: string[]}} filesConfig
+ * @param {*[]} sharedConfig
+ * @returns {*[]}
+ */
+export const applyConfig = (filesConfig, sharedConfig) => sharedConfig
+  .map((config) => ({
+    ...config,
+    ...filesConfig,
+  }));

package/vue3.js

@@ -1,105 +1,116 @@
-module.exports = {
-  extends: ['./browser', 'plugin:vue/vue3-recommended'],
-  plugins: ['vue'],
-  parser: 'vue-eslint-parser',
-  overrides: [
-    {
-      files: '**.vue',
-      rules: {
-        'import/no-default-export': 'off',
-      },
+import { FlatCompat } from '@eslint/eslintrc';
+import parser from 'vue-eslint-parser';
+import browser from './browser.js';
+
+const compat = new FlatCompat();
+
+const config = [
+  ...browser,
+  ...compat.extends('plugin:vue/vue3-recommended'),
+  {
+    languageOptions: {
+      parser,
     },
-  ],
-  rules: {
-    'vue/max-attributes-per-line': ['error', {
-      singleline: 4,
-    }],
-    'vue/html-indent': ['error', 2],
-    'vue/html-closing-bracket-newline': ['error', {
-      singleline: 'never',
-      multiline: 'never',
-    }],
-    // use airbnb rules in vue templates
-    'vue/array-bracket-spacing': 'error',
-    'vue/arrow-spacing': 'error',
-    'vue/block-spacing': 'error',
-    'vue/brace-style': [
-      'error',
-      '1tbs',
-      {
-        allowSingleLine: true,
-      },
-    ],
-    'vue/camelcase': [
-      'error',
-      {
-        properties: 'never',
-      },
-    ],
-    'vue/comma-dangle': [
-      'error',
-      {
-        arrays: 'always-multiline',
-        objects: 'always-multiline',
-        imports: 'always-multiline',
-        exports: 'always-multiline',
-        functions: 'always-multiline',
-      },
-    ],
-    'vue/comma-spacing': 'error',
-    'vue/comma-style': [
-      'error',
-      'last',
-      {
-        exceptions: {
-          ArrayExpression: false,
-          ArrayPattern: false,
-          ArrowFunctionExpression: false,
-          CallExpression: false,
-          FunctionDeclaration: false,
-          FunctionExpression: false,
-          ImportDeclaration: false,
-          ObjectExpression: false,
-          ObjectPattern: false,
-          VariableDeclaration: false,
-          NewExpression: false,
+    rules: {
+      'import/no-default-export': 'off',
+      'vue/max-attributes-per-line': ['error', {
+        singleline: 4,
+      }],
+      'vue/html-indent': ['error', 2],
+      'vue/html-closing-bracket-newline': ['error', {
+        singleline: 'never',
+        multiline: 'never',
+      }],
+      // use airbnb rules in vue templates
+      'vue/array-bracket-spacing': 'error',
+      'vue/arrow-spacing': 'error',
+      'vue/block-spacing': 'error',
+      'vue/brace-style': [
+        'error',
+        '1tbs',
+        {
+          allowSingleLine: true,
         },
-      },
-    ],
-    'vue/dot-location': [
-      'error',
-      'property',
-    ],
-    'vue/dot-notation': 'error',
-    'vue/eqeqeq': 'error',
-    'vue/key-spacing': 'error',
-    'vue/keyword-spacing': 'error',
-    'vue/max-len': ['error', {
-      code: 100,
-      template: 100,
-      comments: 100,
-      ignoreUrls: true,
-      ignoreRegExpLiterals: true,
-      ignoreStrings: true,
-      ignoreTemplateLiterals: true,
-    }],
-    'vue/no-empty-pattern': 'error',
-    'vue/no-irregular-whitespace': 'error',
-    'vue/no-restricted-syntax': [
-      'error',
-      'ForInStatement',
-      'LabeledStatement',
-      'WithStatement',
-    ],
-    'vue/no-useless-concat': 'error',
-    'vue/object-curly-spacing': [
-      'error',
-      'always',
-    ],
-    'vue/prefer-template': 'error',
-    'vue/space-in-parens': 'error',
-    'vue/space-infix-ops': 'error',
-    'vue/space-unary-ops': 'error',
-    'vue/template-curly-spacing': 'error',
+      ],
+      'vue/camelcase': [
+        'error',
+        {
+          properties: 'never',
+        },
+      ],
+      'vue/comma-dangle': [
+        'error',
+        {
+          arrays: 'always-multiline',
+          objects: 'always-multiline',
+          imports: 'always-multiline',
+          exports: 'always-multiline',
+          functions: 'always-multiline',
+        },
+      ],
+      'vue/comma-spacing': 'error',
+      'vue/comma-style': [
+        'error',
+        'last',
+        {
+          exceptions: {
+            ArrayExpression: false,
+            ArrayPattern: false,
+            ArrowFunctionExpression: false,
+            CallExpression: false,
+            FunctionDeclaration: false,
+            FunctionExpression: false,
+            ImportDeclaration: false,
+            ObjectExpression: false,
+            ObjectPattern: false,
+            VariableDeclaration: false,
+            NewExpression: false,
+          },
+        },
+      ],
+      'vue/dot-location': [
+        'error',
+        'property',
+      ],
+      'vue/dot-notation': 'error',
+      'vue/eqeqeq': 'error',
+      'vue/key-spacing': 'error',
+      'vue/keyword-spacing': 'error',
+      'vue/max-len': ['error', {
+        code: 100,
+        template: 100,
+        comments: 100,
+        ignoreUrls: true,
+        ignoreRegExpLiterals: true,
+        ignoreStrings: true,
+        ignoreTemplateLiterals: true,
+      }],
+      'vue/no-empty-pattern': 'error',
+      'vue/no-irregular-whitespace': 'error',
+      'vue/no-restricted-syntax': [
+        'error',
+        'ForInStatement',
+        'LabeledStatement',
+        'WithStatement',
+      ],
+      'vue/no-useless-concat': 'error',
+      'vue/object-curly-spacing': [
+        'error',
+        'always',
+      ],
+      'vue/prefer-template': 'error',
+      'vue/space-in-parens': 'error',
+      'vue/space-infix-ops': 'error',
+      'vue/space-unary-ops': 'error',
+      'vue/template-curly-spacing': 'error',
+    },
   },
-};
+];
+
+// default name '.vue' is invalid processer name in flat config
+const vueConfig = config.find((c) => c?.plugins?.vue);
+if (vueConfig) {
+  vueConfig.plugins.vue.processors.vue = vueConfig.plugins.vue.processors['.vue'];
+}
+
+export default [...config, { processor: 'vue/vue' }];

package/vue.js

@@ -1,105 +0,0 @@
-module.exports = {
-  extends: ['./browser', 'plugin:vue/recommended'],
-  plugins: ['vue'],
-  parser: 'vue-eslint-parser',
-  overrides: [
-    {
-      files: '**.vue',
-      rules: {
-        'import/no-default-export': 'off',
-      },
-    },
-  ],
-  rules: {
-    'vue/max-attributes-per-line': ['error', {
-      singleline: 4,
-    }],
-    'vue/html-indent': ['error', 2],
-    'vue/html-closing-bracket-newline': ['error', {
-      singleline: 'never',
-      multiline: 'never',
-    }],
-    // use airbnb rules in vue templates
-    'vue/array-bracket-spacing': 'error',
-    'vue/arrow-spacing': 'error',
-    'vue/block-spacing': 'error',
-    'vue/brace-style': [
-      'error',
-      '1tbs',
-      {
-        allowSingleLine: true,
-      },
-    ],
-    'vue/camelcase': [
-      'error',
-      {
-        properties: 'never',
-      },
-    ],
-    'vue/comma-dangle': [
-      'error',
-      {
-        arrays: 'always-multiline',
-        objects: 'always-multiline',
-        imports: 'always-multiline',
-        exports: 'always-multiline',
-        functions: 'always-multiline',
-      },
-    ],
-    'vue/comma-spacing': 'error',
-    'vue/comma-style': [
-      'error',
-      'last',
-      {
-        exceptions: {
-          ArrayExpression: false,
-          ArrayPattern: false,
-          ArrowFunctionExpression: false,
-          CallExpression: false,
-          FunctionDeclaration: false,
-          FunctionExpression: false,
-          ImportDeclaration: false,
-          ObjectExpression: false,
-          ObjectPattern: false,
-          VariableDeclaration: false,
-          NewExpression: false,
-        },
-      },
-    ],
-    'vue/dot-location': [
-      'error',
-      'property',
-    ],
-    'vue/dot-notation': 'error',
-    'vue/eqeqeq': 'error',
-    'vue/key-spacing': 'error',
-    'vue/keyword-spacing': 'error',
-    'vue/max-len': ['error', {
-      code: 100,
-      template: 100,
-      comments: 100,
-      ignoreUrls: true,
-      ignoreRegExpLiterals: true,
-      ignoreStrings: true,
-      ignoreTemplateLiterals: true,
-    }],
-    'vue/no-empty-pattern': 'error',
-    'vue/no-irregular-whitespace': 'error',
-    'vue/no-restricted-syntax': [
-      'error',
-      'ForInStatement',
-      'LabeledStatement',
-      'WithStatement',
-    ],
-    'vue/no-useless-concat': 'error',
-    'vue/object-curly-spacing': [
-      'error',
-      'always',
-    ],
-    'vue/prefer-template': 'error',
-    'vue/space-in-parens': 'error',
-    'vue/space-infix-ops': 'error',
-    'vue/space-unary-ops': 'error',
-    'vue/template-curly-spacing': 'error',
-  },
-};