release v0.21.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-monorepo",
-  "version": "0.20.5",
+  "version": "0.21.0",
   "private": true,
   "license": "MIT",
   "author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
@@ -12,7 +12,7 @@
   "devDependencies": {
     "@antfu/eslint-config": "*",
     "bumpp": "^7.1.1",
-    "eslint": "^8.12.0",
+    "eslint": "^8.14.0",
     "eslint-plugin-antfu": "workspace:*",
     "typescript": "^4.6.3"
   }

packages/all/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config",
-  "version": "0.20.5",
+  "version": "0.21.0",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -15,22 +15,22 @@
   "dependencies": {
     "@antfu/eslint-config-react": "workspace:*",
     "@antfu/eslint-config-vue": "workspace:*",
-    "@typescript-eslint/eslint-plugin": "^5.17.0",
-    "@typescript-eslint/parser": "^5.17.0",
+    "@typescript-eslint/eslint-plugin": "^5.20.0",
+    "@typescript-eslint/parser": "^5.20.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-html": "^6.2.0",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsonc": "^2.2.1",
     "eslint-plugin-n": "^15.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-unicorn": "^41.0.1",
-    "eslint-plugin-vue": "^8.5.0",
+    "eslint-plugin-unicorn": "^42.0.0",
+    "eslint-plugin-vue": "^8.7.1",
     "eslint-plugin-yml": "^0.14.0",
     "jsonc-eslint-parser": "^2.1.0",
     "yaml-eslint-parser": "^0.5.0"
   },
   "devDependencies": {
-    "eslint": "^8.12.0"
+    "eslint": "^8.14.0"
   },
   "publishConfig": {
     "access": "public"

packages/basic/index.js

@@ -183,7 +183,15 @@ module.exports = {
     ],
     'object-curly-spacing': ['error', 'always'],
     'no-return-await': 'off',
-    'space-before-function-paren': ['error', 'never'],
+    'space-before-function-paren': [
+      'error',
+      {
+        anonymous: 'always',
+        named: 'never',
+        asyncArrow: 'always',
+      },
+    ],
+    'no-multiple-empty-lines': ['error', { max: 1, maxBOF: 0, maxEOF: 1 }],
 
     // es6
     'no-var': 'error',
@@ -292,8 +300,8 @@ module.exports = {
     'yml/no-empty-document': 'off',
 
     // antfu
-    'antfu/no-leading-newline': 'error',
     'antfu/if-newline': 'error',
+    'antfu/import-dedupe': 'error',
     // 'antfu/prefer-inline-type-import': 'error',
   },
 }

packages/basic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-basic",
-  "version": "0.20.5",
+  "version": "0.21.0",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -19,18 +19,18 @@
     "eslint-plugin-antfu": "workspace:*",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-html": "^6.2.0",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsonc": "^2.2.1",
     "eslint-plugin-markdown": "^2.2.1",
     "eslint-plugin-n": "^15.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-unicorn": "^41.0.1",
+    "eslint-plugin-unicorn": "^42.0.0",
     "eslint-plugin-yml": "^0.14.0",
     "jsonc-eslint-parser": "^2.1.0",
     "yaml-eslint-parser": "^0.5.0"
   },
   "devDependencies": {
-    "eslint": "^8.12.0"
+    "eslint": "^8.14.0"
   },
   "publishConfig": {
     "access": "public"

packages/basic/standard.js

@@ -202,7 +202,14 @@ module.exports = {
     'semi': ['error', 'never'],
     'semi-spacing': ['error', { before: false, after: true }],
     'space-before-blocks': ['error', 'always'],
-    'space-before-function-paren': ['error', 'always'],
+    'space-before-function-paren': [
+      'error',
+      {
+        'anonymous': 'always',
+        'named': 'never',
+        'asyncArrow': 'always'
+      }
+    ],
     'space-in-parens': ['error', 'never'],
     'space-infix-ops': 'error',
     'space-unary-ops': ['error', { words: true, nonwords: false }],

packages/eslint-plugin-antfu/.eslintrc.json

@@ -2,8 +2,5 @@
   "extends": "@antfu",
   "plugins": [
     "antfu"
-  ],
-  "rules": {
-    "antfu/no-leading-newline": "error"
-  }
+  ]
 }

packages/eslint-plugin-antfu/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-antfu",
-  "version": "0.20.5",
+  "version": "0.21.0",
   "license": "MIT",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -22,10 +22,10 @@
     "prepublishOnly": "nr build"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "^5.17.0"
+    "@typescript-eslint/utils": "^5.20.0"
   },
   "devDependencies": {
-    "unbuild": "^0.7.0",
-    "vitest": "^0.8.2"
+    "unbuild": "^0.7.4",
+    "vitest": "^0.9.4"
   }
 }

packages/eslint-plugin-antfu/src/index.ts

@@ -1,11 +1,11 @@
 import ifNewline from './rules/if-newline'
-import noLeadingNewline from './rules/no-leading-newline'
+import importDedupe from './rules/import-dedupe'
 import preferInlineTypeImport from './rules/prefer-inline-type-import'
 
 export default {
   rules: {
-    'no-leading-newline': noLeadingNewline,
     'if-newline': ifNewline,
+    'import-dedupe': importDedupe,
     'prefer-inline-type-import': preferInlineTypeImport,
   },
 }

packages/eslint-plugin-antfu/src/rules/import-dedupe.test.ts

@@ -1,14 +1,15 @@
 import { RuleTester } from '@typescript-eslint/utils/dist/ts-eslint'
 import { it } from 'vitest'
-import rule, { RULE_NAME } from './no-leading-newline'
+import rule, { RULE_NAME } from './import-dedupe'
 
 const valids = [
-  'import {} from \'foo\'',
-  `// comment
-import {} from ''`,
+  'import { a } from \'foo\'',
 ]
 const invalids = [
-  '\n\nimport {} from \'fo\'',
+  [
+    'import { a, b, a, a, c, a } from \'foo\'',
+    'import { a, b,   c,  } from \'foo\'',
+  ],
 ]
 
 it('runs', () => {
@@ -19,9 +20,9 @@ it('runs', () => {
   ruleTester.run(RULE_NAME, rule, {
     valid: valids,
     invalid: invalids.map(i => ({
-      code: i,
-      output: i.trim(),
-      errors: [{ messageId: 'noLeadingNewline' }],
+      code: i[0],
+      output: i[1],
+      errors: [{ messageId: 'importDedupe' }, { messageId: 'importDedupe' }, { messageId: 'importDedupe' }],
     })),
   })
 })

packages/eslint-plugin-antfu/src/rules/import-dedupe.ts

@@ -0,0 +1,55 @@
+import { createEslintRule } from '../utils'
+
+export const RULE_NAME = 'import-dedupe'
+export type MessageIds = 'importDedupe'
+export type Options = []
+
+export default createEslintRule<Options, MessageIds>({
+  name: RULE_NAME,
+  meta: {
+    type: 'problem',
+    docs: {
+      description: 'Fix duplication in imports',
+      recommended: 'error',
+    },
+    fixable: 'code',
+    schema: [],
+    messages: {
+      importDedupe: 'Expect no duplication in imports',
+    },
+  },
+  defaultOptions: [],
+  create: (context) => {
+    return {
+      ImportDeclaration(node) {
+        if (node.specifiers.length <= 1)
+          return
+
+        const names = new Set<string>()
+        node.specifiers.forEach((n) => {
+          const id = n.local.name
+          if (names.has(id)) {
+            context.report({
+              node,
+              loc: {
+                start: n.loc.end,
+                end: n.loc.start,
+              },
+              messageId: 'importDedupe',
+              fix(fixer) {
+                const s = n.range[0]
+                let e = n.range[1]
+                if (context.getSourceCode().text[e] === ',')
+                  e += 1
+                return fixer.removeRange([s, e])
+              },
+            })
+          }
+          names.add(id)
+        })
+
+        // console.log(node)
+      },
+    }
+  },
+})

packages/eslint-plugin-antfu/src/rules/no-leading-newline.ts

@@ -1,44 +0,0 @@
-import { createEslintRule } from '../utils'
-
-export const RULE_NAME = 'no-leading-newline'
-export type MessageIds = 'noLeadingNewline'
-export type Options = []
-
-export default createEslintRule<Options, MessageIds>({
-  name: RULE_NAME,
-  meta: {
-    type: 'problem',
-    docs: {
-      description: 'Do not allow leading newline',
-      recommended: 'error',
-    },
-    fixable: 'whitespace',
-    schema: [],
-    messages: {
-      noLeadingNewline: 'No leading newline allowed',
-    },
-  },
-  defaultOptions: [],
-  create: (context) => {
-    return {
-      Program(node) {
-        const code = context.getSourceCode()
-        const match = code.text.match(/^[\s]+/)?.[0] || ''
-        if (match.includes('\n')) {
-          const line = match.split('\n')
-          context.report({
-            node,
-            loc: {
-              start: { line: 0, column: 0 },
-              end: { line: line.length - 1, column: line[line.length - 1].length },
-            },
-            messageId: 'noLeadingNewline',
-            fix(fixer) {
-              return fixer.replaceTextRange([0, match.length], '')
-            },
-          })
-        }
-      },
-    }
-  },
-})

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-react",
-  "version": "0.20.5",
+  "version": "0.21.0",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -23,7 +23,7 @@
     "eslint-plugin-react": "^7.29.4"
   },
   "devDependencies": {
-    "eslint": "^8.12.0",
+    "eslint": "^8.14.0",
     "react": "^18.0.0",
     "typescript": "^4.6.3"
   }

packages/typescript/index.js

@@ -30,11 +30,39 @@ module.exports = {
     'no-useless-constructor': 'off',
     'indent': 'off',
     '@typescript-eslint/indent': ['error', 2, {
+      SwitchCase: 1,
+      VariableDeclarator: 1,
+      outerIIFEBody: 1,
+      MemberExpression: 1,
+      FunctionDeclaration: { parameters: 1, body: 1 },
+      FunctionExpression: { parameters: 1, body: 1 },
+      CallExpression: { arguments: 1 },
+      ArrayExpression: 1,
+      ObjectExpression: 1,
+      ImportDeclaration: 1,
+      flatTernaryExpressions: false,
+      ignoreComments: false,
       ignoredNodes: [
+        'TemplateLiteral *',
+        'JSXElement',
+        'JSXElement > *',
         'JSXAttribute',
+        'JSXIdentifier',
+        'JSXNamespacedName',
+        'JSXMemberExpression',
+        'JSXSpreadAttribute',
+        'JSXExpressionContainer',
+        'JSXOpeningElement',
+        'JSXClosingElement',
+        'JSXFragment',
+        'JSXOpeningFragment',
+        'JSXClosingFragment',
+        'JSXText',
+        'JSXEmptyExpression',
+        'JSXSpreadChild',
         'TSTypeParameterInstantiation',
       ],
-      SwitchCase: 1,
+      offsetTernaryExpressions: true,
     }],
     'no-unused-vars': 'off',
     '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],

packages/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-ts",
-  "version": "0.20.5",
+  "version": "0.21.0",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "@antfu/eslint-config-basic": "workspace:*",
-    "@typescript-eslint/eslint-plugin": "^5.17.0",
-    "@typescript-eslint/parser": "^5.17.0"
+    "@typescript-eslint/eslint-plugin": "^5.20.0",
+    "@typescript-eslint/parser": "^5.20.0"
   },
   "devDependencies": {
-    "eslint": "^8.12.0"
+    "eslint": "^8.14.0"
   }
 }

packages/vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-vue",
-  "version": "0.20.5",
+  "version": "0.21.0",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@antfu/eslint-config-ts": "workspace:*",
-    "eslint-plugin-vue": "^8.5.0"
+    "eslint-plugin-vue": "^8.7.1"
   },
   "devDependencies": {
-    "eslint": "^8.12.0"
+    "eslint": "^8.14.0"
   }
 }