release v0.20.2

Co-authored-by: CondorHero <love2xinwei@gmail.com>

README.md

@@ -34,7 +34,8 @@ For example:
 ```json
 {
   "scripts": {
-    "lint": "eslint ."
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   }
 }
 ```
@@ -54,7 +55,9 @@ Create `.vscode/settings.json`
 
 ## Check Also
 
+- [antfu/dotfiles](https://github.com/antfu/dotfiles) - My dotfiles
 - [antfu/vscode-settings](https://github.com/antfu/vscode-settings) - My VS Code settings
+- [antfu/eslint-config](https://github.com/antfu/eslint-config) - My ESLint config
 - [antfu/ts-starter](https://github.com/antfu/ts-starter) - My starter template for TypeScript library
 - [antfu/vitesse](https://github.com/antfu/vitesse) - My starter template for Vue & Vite app
 

lerna.json

@@ -1,6 +0,0 @@
-{
-  "packages": [
-    "packages/*"
-  ],
-  "version": "0.19.1"
-}

package.json

@@ -1,17 +1,19 @@
 {
   "name": "@antfu/eslint-config-monorepo",
+  "version": "0.20.2",
   "private": true,
   "license": "MIT",
   "author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
   "scripts": {
-    "preinstall": "npx only-allow pnpm",
     "lint": "eslint .",
-    "release": "lerna publish --conventional-commits"
+    "prepare": "pnpm -r run stub",
+    "release": "bumpp package.json packages/*/package.json --commit --push --tag && pnpm -r publish --access public"
   },
   "devDependencies": {
     "@antfu/eslint-config": "*",
+    "bumpp": "^7.1.1",
     "eslint": "^8.12.0",
-    "lerna": "^4.0.0",
+    "eslint-plugin-antfu": "workspace:*",
     "typescript": "^4.6.3"
   }
 }

packages/all/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config",
-  "version": "0.19.1",
+  "version": "0.20.2",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -13,8 +13,8 @@
     "eslint": ">=7.4.0"
   },
   "dependencies": {
-    "@antfu/eslint-config-react": "^0.19.1",
-    "@antfu/eslint-config-vue": "^0.19.1",
+    "@antfu/eslint-config-react": "workspace:*",
+    "@antfu/eslint-config-vue": "workspace:*",
     "@typescript-eslint/eslint-plugin": "^5.17.0",
     "@typescript-eslint/parser": "^5.17.0",
     "eslint-plugin-eslint-comments": "^3.2.0",

packages/basic/index.js

@@ -32,10 +32,11 @@ module.exports = {
   plugins: [
     'html',
     'unicorn',
+    'antfu',
   ],
   settings: {
     'import/resolver': {
-      node: { extensions: ['.js', '.mjs', '.ts', '.d.ts'] },
+      node: { extensions: ['.js', '.mjs'] },
     },
   },
   overrides: [
@@ -288,5 +289,10 @@ module.exports = {
     // yml
     'yml/quotes': ['error', { prefer: 'single', avoidEscape: false }],
     'yml/no-empty-document': 'off',
+
+    // antfu
+    'antfu/no-leading-newline': 'error',
+    'antfu/if-newline': 'error',
+    // 'antfu/prefer-inline-type-import': 'error',
   },
 }

packages/basic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-basic",
-  "version": "0.19.1",
+  "version": "0.20.2",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -16,6 +16,7 @@
     "eslint": ">=7.4.0"
   },
   "dependencies": {
+    "eslint-plugin-antfu": "workspace:*",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-html": "^6.2.0",
     "eslint-plugin-import": "^2.25.4",

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

@@ -0,0 +1,9 @@
+{
+  "extends": "@antfu",
+  "plugins": [
+    "antfu"
+  ],
+  "rules": {
+    "antfu/no-leading-newline": "error"
+  }
+}

packages/eslint-plugin-antfu/build.config.ts

@@ -0,0 +1,12 @@
+import { defineBuildConfig } from 'unbuild'
+
+export default defineBuildConfig({
+  entries: [
+    'src/index',
+  ],
+  declaration: true,
+  clean: true,
+  rollup: {
+    emitCJS: true,
+  },
+})

packages/eslint-plugin-antfu/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "eslint-plugin-antfu",
+  "version": "0.20.2",
+  "license": "MIT",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "rimraf dist && unbuild",
+    "stub": "unbuild --stub",
+    "test": "vitest",
+    "prepublishOnly": "nr build"
+  },
+  "dependencies": {
+    "@typescript-eslint/utils": "^5.17.0"
+  },
+  "devDependencies": {
+    "unbuild": "^0.7.0",
+    "vitest": "^0.8.2"
+  }
+}

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

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

packages/eslint-plugin-antfu/src/rules/if-newline.test.ts

@@ -0,0 +1,30 @@
+import { RuleTester } from '@typescript-eslint/utils/dist/ts-eslint'
+import { it } from 'vitest'
+import rule, { RULE_NAME } from './if-newline'
+
+const valids = [
+  `if (true)
+  console.log('hello')
+`,
+  `if (true) {
+  console.log('hello')
+}`,
+]
+const invalids = [
+  ['if (true) console.log(\'hello\')', 'if (true) \nconsole.log(\'hello\')'],
+]
+
+it('runs', () => {
+  const ruleTester: RuleTester = new RuleTester({
+    parser: require.resolve('@typescript-eslint/parser'),
+  })
+
+  ruleTester.run(RULE_NAME, rule, {
+    valid: valids,
+    invalid: invalids.map(i => ({
+      code: i[0],
+      output: i[1],
+      errors: [{ messageId: 'missingIfNewline' }],
+    })),
+  })
+})

packages/eslint-plugin-antfu/src/rules/if-newline.ts

@@ -0,0 +1,45 @@
+import { createEslintRule } from '../utils'
+
+export const RULE_NAME = 'if-newline'
+export type MessageIds = 'missingIfNewline'
+export type Options = []
+
+export default createEslintRule<Options, MessageIds>({
+  name: RULE_NAME,
+  meta: {
+    type: 'problem',
+    docs: {
+      description: 'Newline after if',
+      recommended: 'error',
+    },
+    fixable: 'code',
+    schema: [],
+    messages: {
+      missingIfNewline: 'Expect newline after if',
+    },
+  },
+  defaultOptions: [],
+  create: (context) => {
+    return {
+      IfStatement(node) {
+        if (!node.consequent)
+          return
+        if (node.consequent.type === 'BlockStatement')
+          return
+        if (node.test.loc.end.line === node.consequent.loc.start.line) {
+          context.report({
+            node,
+            loc: {
+              start: node.test.loc.end,
+              end: node.consequent.loc.start,
+            },
+            messageId: 'missingIfNewline',
+            fix(fixer) {
+              return fixer.replaceTextRange([node.consequent.range[0], node.consequent.range[0]], '\n')
+            },
+          })
+        }
+      },
+    }
+  },
+})

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

@@ -0,0 +1,27 @@
+import { RuleTester } from '@typescript-eslint/utils/dist/ts-eslint'
+import { it } from 'vitest'
+import rule, { RULE_NAME } from './no-leading-newline'
+
+const valids = [
+  'import {} from \'foo\'',
+  `// comment
+import {} from ''`,
+]
+const invalids = [
+  '\n\nimport {} from \'fo\'',
+]
+
+it('runs', () => {
+  const ruleTester: RuleTester = new RuleTester({
+    parser: require.resolve('@typescript-eslint/parser'),
+  })
+
+  ruleTester.run(RULE_NAME, rule, {
+    valid: valids,
+    invalid: invalids.map(i => ({
+      code: i,
+      output: i.trim(),
+      errors: [{ messageId: 'noLeadingNewline' }],
+    })),
+  })
+})

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

@@ -0,0 +1,44 @@
+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/eslint-plugin-antfu/src/rules/prefer-inline-type-import.test.ts

@@ -0,0 +1,27 @@
+import { RuleTester } from '@typescript-eslint/utils/dist/ts-eslint'
+import { it } from 'vitest'
+import rule, { RULE_NAME } from './prefer-inline-type-import'
+
+const valids = [
+  'import { type Foo } from \'foo\'',
+  'import type Foo from \'foo\'',
+  'import type * as Foo from \'foo\'',
+]
+const invalids = [
+  ['import type { Foo } from \'foo\'', 'import { type Foo } from \'foo\''],
+]
+
+it('runs', () => {
+  const ruleTester: RuleTester = new RuleTester({
+    parser: require.resolve('@typescript-eslint/parser'),
+  })
+
+  ruleTester.run(RULE_NAME, rule, {
+    valid: valids,
+    invalid: invalids.map(i => ({
+      code: i[0],
+      output: i[1].trim(),
+      errors: [{ messageId: 'preferInlineTypeImport' }],
+    })),
+  })
+})

packages/eslint-plugin-antfu/src/rules/prefer-inline-type-import.ts

@@ -0,0 +1,63 @@
+// Ported from https://github.com/gajus/eslint-plugin-canonical/blob/master/src/rules/preferInlineTypeImport.js
+// by Gajus Kuizinas https://github.com/gajus
+
+import { createEslintRule } from '../utils'
+
+export const RULE_NAME = 'prefer-inline-type-import'
+export type MessageIds = 'preferInlineTypeImport'
+export type Options = []
+
+export default createEslintRule<Options, MessageIds>({
+  name: RULE_NAME,
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'Newline after if',
+      recommended: 'error',
+    },
+    fixable: 'code',
+    schema: [],
+    messages: {
+      preferInlineTypeImport: 'Prefer inline type import',
+    },
+  },
+  defaultOptions: [],
+  create: (context) => {
+    const sourceCode = context.getSourceCode()
+    return {
+      ImportDeclaration: (node) => {
+        // ignore bare type imports
+        if (node.specifiers.length === 1 && ['ImportNamespaceSpecifier', 'ImportDefaultSpecifier'].includes(node.specifiers[0].type))
+          return
+        if (node.importKind === 'type') {
+          context.report({
+            *fix(fixer) {
+              yield * removeTypeSpecifier(fixer, sourceCode, node)
+
+              for (const specifier of node.specifiers)
+                yield fixer.insertTextBefore(specifier, 'type ')
+            },
+            loc: node.loc,
+            messageId: 'preferInlineTypeImport',
+            node,
+          })
+        }
+      },
+    }
+  },
+})
+
+function *removeTypeSpecifier(fixer, sourceCode, node) {
+  const importKeyword = sourceCode.getFirstToken(node)
+
+  const typeIdentifier = sourceCode.getTokenAfter(importKeyword)
+
+  yield fixer.remove(typeIdentifier)
+
+  if (importKeyword.loc.end.column + 1 === typeIdentifier.loc.start.column) {
+    yield fixer.removeRange([
+      importKeyword.range[1],
+      importKeyword.range[1] + 1,
+    ])
+  }
+}

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

@@ -0,0 +1,5 @@
+import { ESLintUtils } from '@typescript-eslint/utils'
+
+export const createEslintRule = ESLintUtils.RuleCreator(
+  ruleName => ruleName,
+)

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-react",
-  "version": "0.19.1",
+  "version": "0.20.2",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -19,7 +19,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@antfu/eslint-config-ts": "^0.19.1",
+    "@antfu/eslint-config-ts": "workspace:*",
     "eslint-plugin-react": "^7.29.4"
   },
   "devDependencies": {

packages/typescript/index.js

@@ -4,8 +4,14 @@ const basic = require('@antfu/eslint-config-basic')
 module.exports = {
   extends: [
     '@antfu/eslint-config-basic',
+    'plugin:import/typescript',
     'plugin:@typescript-eslint/recommended',
   ],
+  settings: {
+    'import/resolver': {
+      node: { extensions: ['.js', '.jsx', '.mjs', '.ts', '.tsx', '.d.ts'] },
+    },
+  },
   overrides: basic.overrides,
   rules: {
     'import/named': 'off',

packages/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-ts",
-  "version": "0.19.1",
+  "version": "0.20.2",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -17,7 +17,7 @@
     "typescript": ">=3.9"
   },
   "dependencies": {
-    "@antfu/eslint-config-basic": "^0.19.1",
+    "@antfu/eslint-config-basic": "workspace:*",
     "@typescript-eslint/eslint-plugin": "^5.17.0",
     "@typescript-eslint/parser": "^5.17.0"
   },

packages/vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antfu/eslint-config-vue",
-  "version": "0.19.1",
+  "version": "0.20.2",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -16,7 +16,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@antfu/eslint-config-ts": "^0.19.1",
+    "@antfu/eslint-config-ts": "workspace:*",
     "eslint-plugin-vue": "^8.5.0"
   },
   "devDependencies": {