chore: release v0.31.1

fixtures/vitesse/package.json

@@ -15,48 +15,48 @@
     "up": "taze major -I"
   },
   "dependencies": {
-    "@unocss/reset": "^0.45.8",
-    "@vueuse/core": "^9.1.0",
-    "@vueuse/head": "^0.7.9",
+    "@unocss/reset": "^0.47.0",
+    "@vueuse/core": "^9.6.0",
+    "@vueuse/head": "^1.0.18",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.17",
-    "vue": "^3.2.37",
-    "vue-demi": "^0.13.6",
+    "pinia": "^2.0.27",
+    "vue": "^3.2.45",
+    "vue-demi": "^0.13.11",
     "vue-i18n": "^9.2.2",
-    "vue-router": "^4.1.3"
+    "vue-router": "^4.1.6"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.25.2",
-    "@iconify-json/carbon": "^1.1.7",
-    "@intlify/vite-plugin-vue-i18n": "^6.0.0",
+    "@antfu/eslint-config": "^0.31.0",
+    "@iconify-json/carbon": "^1.1.11",
+    "@intlify/vite-plugin-vue-i18n": "^6.0.3",
     "@types/markdown-it-link-attributes": "^3.0.1",
     "@types/nprogress": "^0.2.0",
-    "@vitejs/plugin-vue": "^3.0.1",
-    "@vue/test-utils": "^2.0.2",
+    "@vitejs/plugin-vue": "^3.2.0",
+    "@vue/test-utils": "^2.2.4",
     "critters": "^0.0.16",
     "cross-env": "^7.0.3",
-    "cypress": "^10.4.0",
-    "eslint": "^8.21.0",
+    "cypress": "^11.2.0",
+    "eslint": "^8.28.0",
     "eslint-plugin-cypress": "^2.12.1",
     "https-localhost": "^4.7.1",
-    "markdown-it-link-attributes": "^4.0.0",
-    "markdown-it-shiki": "^0.5.1",
-    "pnpm": "^7.8.0",
-    "shiki": "^0.10.1",
-    "taze": "^0.7.6",
-    "typescript": "^4.7.4",
-    "unocss": "^0.45.5",
-    "unplugin-auto-import": "^0.11.0",
-    "unplugin-vue-components": "^0.22.0",
-    "vite": "^3.0.4",
-    "vite-plugin-inspect": "^0.6.0",
-    "vite-plugin-pages": "^0.25.0",
-    "vite-plugin-pwa": "^0.12.3",
+    "markdown-it-link-attributes": "^4.0.1",
+    "markdown-it-shiki": "^0.6.1",
+    "pnpm": "^7.17.1",
+    "shiki": "^0.11.1",
+    "taze": "^0.8.4",
+    "typescript": "^4.9.3",
+    "unocss": "^0.47.0",
+    "unplugin-auto-import": "^0.12.0",
+    "unplugin-vue-components": "^0.22.11",
+    "vite": "^3.2.4",
+    "vite-plugin-inspect": "^0.7.9",
+    "vite-plugin-pages": "^0.27.1",
+    "vite-plugin-pwa": "^0.13.3",
     "vite-plugin-vue-layouts": "^0.7.0",
-    "vite-plugin-vue-markdown": "^0.21.1",
-    "vite-ssg": "^0.20.2",
-    "vite-ssg-sitemap": "^0.3.1",
-    "vitest": "^0.21.0",
-    "vue-tsc": "^0.39.5"
+    "vite-plugin-vue-markdown": "^0.22.1",
+    "vite-ssg": "^0.22.0",
+    "vite-ssg-sitemap": "^0.4.3",
+    "vitest": "^0.25.3",
+    "vue-tsc": "^1.0.9"
   }
 }

fixtures/vitesse/src/modules/nprogress.ts

@@ -7,6 +7,8 @@ export const install: UserModule = ({ isClient, router }) => {
       if (to.path !== from.path)
         NProgress.start()
     })
-    router.afterEach(() => { NProgress.done() })
+    router.afterEach(() => {
+      NProgress.done()
+    })
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-monorepo",
-  "version": "0.29.0",
+  "version": "0.31.1",
   "private": true,
   "packageManager": "pnpm@7.1.0",
   "author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
@@ -14,9 +14,9 @@
   "devDependencies": {
     "@antfu/eslint-config": "*",
     "bumpp": "^8.2.1",
-    "eslint": "^8.23.0",
+    "eslint": "^8.28.0",
     "eslint-plugin-antfu": "workspace:*",
     "rimraf": "^3.0.2",
-    "typescript": "^4.8.2"
+    "typescript": "^4.9.3"
   }
 }

packages/all/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config",
-  "version": "0.29.0",
+  "version": "0.31.1",
   "description": "Anthony's ESLint config",
   "author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
   "license": "MIT",
@@ -17,21 +17,21 @@
   },
   "dependencies": {
     "@antfu/eslint-config-vue": "workspace:*",
-    "@typescript-eslint/eslint-plugin": "^5.36.1",
-    "@typescript-eslint/parser": "^5.36.1",
+    "@typescript-eslint/eslint-plugin": "^5.45.0",
+    "@typescript-eslint/parser": "^5.45.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-html": "^7.1.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsonc": "^2.4.0",
-    "eslint-plugin-n": "^15.2.5",
-    "eslint-plugin-promise": "^6.0.1",
-    "eslint-plugin-unicorn": "^43.0.2",
-    "eslint-plugin-vue": "^9.4.0",
-    "eslint-plugin-yml": "^1.1.0",
+    "eslint-plugin-jsonc": "^2.5.0",
+    "eslint-plugin-n": "^15.5.1",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-unicorn": "^45.0.1",
+    "eslint-plugin-vue": "^9.8.0",
+    "eslint-plugin-yml": "^1.2.0",
     "jsonc-eslint-parser": "^2.1.0",
     "yaml-eslint-parser": "^1.1.0"
   },
   "devDependencies": {
-    "eslint": "^8.23.0"
+    "eslint": "^8.28.0"
   }
 }

packages/basic/index.js

@@ -285,6 +285,7 @@ module.exports = {
     'require-await': 'off',
     'no-return-assign': 'off',
     'operator-linebreak': ['error', 'before'],
+    'max-statements-per-line': ['error', { max: 1 }],
 
     // unicorns
     // Pass error message when throwing errors

packages/basic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-basic",
-  "version": "0.29.0",
+  "version": "0.31.1",
   "description": "",
   "author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
   "license": "MIT",
@@ -23,17 +23,17 @@
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-html": "^7.1.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsonc": "^2.4.0",
+    "eslint-plugin-jsonc": "^2.5.0",
     "eslint-plugin-markdown": "^3.0.0",
-    "eslint-plugin-n": "^15.2.5",
+    "eslint-plugin-n": "^15.5.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
-    "eslint-plugin-promise": "^6.0.1",
-    "eslint-plugin-unicorn": "^43.0.2",
-    "eslint-plugin-yml": "^1.1.0",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-unicorn": "^45.0.1",
+    "eslint-plugin-yml": "^1.2.0",
     "jsonc-eslint-parser": "^2.1.0",
     "yaml-eslint-parser": "^1.1.0"
   },
   "devDependencies": {
-    "eslint": "^8.23.0"
+    "eslint": "^8.28.0"
   }
 }

packages/eslint-plugin-antfu/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-antfu",
-  "version": "0.29.0",
+  "version": "0.31.1",
   "license": "MIT",
   "homepage": "https://github.com/antfu/eslint-config",
   "main": "./dist/index.cjs",
@@ -16,11 +16,11 @@
     "prepublishOnly": "nr build"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "^5.36.1"
+    "@typescript-eslint/utils": "^5.45.0"
   },
   "devDependencies": {
-    "@types/node": "^18.11.8",
-    "unbuild": "^0.8.10",
-    "vitest": "^0.22.1"
+    "@types/node": "^18.11.9",
+    "unbuild": "^1.0.1",
+    "vitest": "^0.25.3"
   }
 }

packages/eslint-plugin-antfu/src/rules/generic-spacing.test.ts

@@ -4,16 +4,36 @@ import rule, { RULE_NAME } from './generic-spacing'
 
 const valids = [
   'type Foo<T = true> = T',
+  'type Foo<T extends true = true> = T',
   `
 type Foo<
   T = true,
   K = false
 > = T`,
+  `function foo<
+  T
+>() {}`,
+  'const foo = <T>(name: T) => name',
+  `interface Log {
+    foo<T>(name: T): void
+  }`,
+  `interface Log {
+  <T>(name: T): void
+}`,
+`interface Foo {
+  foo?: <T>(name: T) => void
+}`,
 ]
 const invalids = [
   ['type Foo<T=true> = T', 'type Foo<T = true> = T'],
   ['type Foo<T,K> = T', 'type Foo<T, K> = T'],
   ['type Foo<T=false,K=1|2> = T', 'type Foo<T = false, K = 1|2> = T', 3],
+  ['function foo <T>() {}', 'function foo<T>() {}'],
+  [`interface Log {
+  foo <T>(name: T): void
+}`, `interface Log {
+  foo<T>(name: T): void
+}`],
 ] as const
 
 it('runs', () => {

packages/eslint-plugin-antfu/src/rules/generic-spacing.ts

@@ -23,6 +23,22 @@ export default createEslintRule<Options, MessageIds>({
     const sourceCode = context.getSourceCode()
     return {
       TSTypeParameterDeclaration: (node) => {
+        if (!['TSCallSignatureDeclaration', 'ArrowFunctionExpression', 'TSFunctionType'].includes(node.parent.type)) {
+          const pre = sourceCode.text.slice(0, node.range[0])
+          const preSpace = pre.match(/(\s+)$/)?.[0]
+          // strip space before <T>
+          if (preSpace && preSpace.length) {
+            context.report({
+              node,
+              messageId: 'genericSpacingMismatch',
+              *fix(fixer) {
+                yield fixer.replaceTextRange([node.range[0] - preSpace.length, node.range[0]], '')
+              },
+            })
+          }
+        }
+
+        // add space between <T,K>
         const params = node.params
         for (let i = 1; i < params.length; i++) {
           const prev = params[i - 1]
@@ -45,10 +61,12 @@ export default createEslintRule<Options, MessageIds>({
           }
         }
       },
+      // add space around = in type Foo<T = true>
       TSTypeParameter: (node) => {
         if (!node.default)
           return
-        const from = node.name.range[1]
+        const endNode = node.constraint || node.name
+        const from = endNode.range[1]
         const to = node.default.range[0]
         if (sourceCode.text.slice(from, to) !== ' = ') {
           context.report({
@@ -56,7 +74,7 @@ export default createEslintRule<Options, MessageIds>({
               yield fixer.replaceTextRange([from, to], ' = ')
             },
             loc: {
-              start: node.name.loc.end,
+              start: endNode.loc.end,
               end: node.default.loc.start,
             },
             messageId: 'genericSpacingMismatch',

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-react",
-  "version": "0.29.0",
+  "version": "0.31.1",
   "description": "",
   "author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
   "license": "MIT",
@@ -20,12 +20,12 @@
   },
   "dependencies": {
     "@antfu/eslint-config-ts": "workspace:*",
-    "eslint-plugin-react": "^7.31.1",
+    "eslint-plugin-react": "^7.31.11",
     "eslint-plugin-react-hooks": "^4.6.0"
   },
   "devDependencies": {
-    "eslint": "^8.23.0",
+    "eslint": "^8.28.0",
     "react": "^18.2.0",
-    "typescript": "^4.8.2"
+    "typescript": "^4.9.3"
   }
 }

packages/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-ts",
-  "version": "0.29.0",
+  "version": "0.31.1",
   "description": "",
   "author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
   "license": "MIT",
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "@antfu/eslint-config-basic": "workspace:*",
-    "@typescript-eslint/eslint-plugin": "^5.36.1",
-    "@typescript-eslint/parser": "^5.36.1"
+    "@typescript-eslint/eslint-plugin": "^5.45.0",
+    "@typescript-eslint/parser": "^5.45.0"
   },
   "devDependencies": {
-    "eslint": "^8.23.0"
+    "eslint": "^8.28.0"
   }
 }

packages/vue/index.js

@@ -1,3 +1,10 @@
+const { isPackageExists } = require('local-pkg')
+
+const TS = isPackageExists('typescript')
+
+if (!TS)
+  console.warn('[@antfu/eslint-config] TypeScript is not installed, fallback to JS only.')
+
 module.exports = {
   overrides: [
     {
@@ -9,13 +16,17 @@ module.exports = {
       rules: {
         'no-unused-vars': 'off',
         'no-undef': 'off',
-        '@typescript-eslint/no-unused-vars': 'off',
+        ...(TS
+          ? { '@typescript-eslint/no-unused-vars': 'off' }
+          : null),
       },
     },
   ],
   extends: [
     'plugin:vue/vue3-recommended',
-    '@antfu/eslint-config-ts',
+    TS
+      ? '@antfu/eslint-config-ts'
+      : '@antfu/eslint-config-basic',
   ],
   rules: {
     'vue/max-attributes-per-line': 'off',

packages/vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-vue",
-  "version": "0.29.0",
+  "version": "0.31.1",
   "description": "",
   "author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
   "license": "MIT",
@@ -15,10 +15,12 @@
     "eslint": ">=7.4.0"
   },
   "dependencies": {
+    "@antfu/eslint-config-basic": "workspace:*",
     "@antfu/eslint-config-ts": "workspace:*",
-    "eslint-plugin-vue": "^9.4.0"
+    "eslint-plugin-vue": "^9.8.0",
+    "local-pkg": "^0.4.2"
   },
   "devDependencies": {
-    "eslint": "^8.23.0"
+    "eslint": "^8.28.0"
   }
 }