Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
ea70c5c6aa | ||
|
2e9948029c | ||
|
a6692cc074 | ||
|
ded3cf2da2 |
@@ -1,17 +1,19 @@
|
||||
{
|
||||
"name": "@antfu/eslint-config-monorepo",
|
||||
"version": "0.19.2",
|
||||
"version": "0.19.4",
|
||||
"private": true,
|
||||
"license": "MIT",
|
||||
"author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
|
||||
"scripts": {
|
||||
"lint": "eslint .",
|
||||
"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",
|
||||
"eslint-plugin-antfu": "workspace:*",
|
||||
"typescript": "^4.6.3"
|
||||
}
|
||||
}
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@antfu/eslint-config",
|
||||
"version": "0.19.2",
|
||||
"version": "0.19.4",
|
||||
"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",
|
||||
|
@@ -32,6 +32,7 @@ module.exports = {
|
||||
plugins: [
|
||||
'html',
|
||||
'unicorn',
|
||||
'antfu',
|
||||
],
|
||||
settings: {
|
||||
'import/resolver': {
|
||||
@@ -288,5 +289,9 @@ 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',
|
||||
},
|
||||
}
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@antfu/eslint-config-basic",
|
||||
"version": "0.19.2",
|
||||
"version": "0.19.4",
|
||||
"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",
|
||||
|
9
packages/eslint-plugin-antfu/.eslintrc.json
Normal file
9
packages/eslint-plugin-antfu/.eslintrc.json
Normal file
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"extends": "@antfu",
|
||||
"plugins": [
|
||||
"antfu"
|
||||
],
|
||||
"rules": {
|
||||
"antfu/no-leading-newline": "error"
|
||||
}
|
||||
}
|
12
packages/eslint-plugin-antfu/build.config.ts
Normal file
12
packages/eslint-plugin-antfu/build.config.ts
Normal file
@@ -0,0 +1,12 @@
|
||||
import { defineBuildConfig } from 'unbuild'
|
||||
|
||||
export default defineBuildConfig({
|
||||
entries: [
|
||||
'src/index',
|
||||
],
|
||||
declaration: true,
|
||||
clean: true,
|
||||
rollup: {
|
||||
emitCJS: true,
|
||||
},
|
||||
})
|
31
packages/eslint-plugin-antfu/package.json
Normal file
31
packages/eslint-plugin-antfu/package.json
Normal file
@@ -0,0 +1,31 @@
|
||||
{
|
||||
"name": "eslint-plugin-antfu",
|
||||
"version": "0.19.4",
|
||||
"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"
|
||||
}
|
||||
}
|
9
packages/eslint-plugin-antfu/src/index.ts
Normal file
9
packages/eslint-plugin-antfu/src/index.ts
Normal file
@@ -0,0 +1,9 @@
|
||||
import ifNewline from './rules/if-newline'
|
||||
import noLeadingNewline from './rules/no-leading-newline'
|
||||
|
||||
export default {
|
||||
rules: {
|
||||
'no-leading-newline': noLeadingNewline,
|
||||
'if-newline': ifNewline,
|
||||
},
|
||||
}
|
30
packages/eslint-plugin-antfu/src/rules/if-newline.test.ts
Normal file
30
packages/eslint-plugin-antfu/src/rules/if-newline.test.ts
Normal file
@@ -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' }],
|
||||
})),
|
||||
})
|
||||
})
|
45
packages/eslint-plugin-antfu/src/rules/if-newline.ts
Normal file
45
packages/eslint-plugin-antfu/src/rules/if-newline.ts
Normal file
@@ -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')
|
||||
},
|
||||
})
|
||||
}
|
||||
},
|
||||
}
|
||||
},
|
||||
})
|
@@ -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' }],
|
||||
})),
|
||||
})
|
||||
})
|
44
packages/eslint-plugin-antfu/src/rules/no-leading-newline.ts
Normal file
44
packages/eslint-plugin-antfu/src/rules/no-leading-newline.ts
Normal file
@@ -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], '')
|
||||
},
|
||||
})
|
||||
}
|
||||
},
|
||||
}
|
||||
},
|
||||
})
|
5
packages/eslint-plugin-antfu/src/utils.ts
Normal file
5
packages/eslint-plugin-antfu/src/utils.ts
Normal file
@@ -0,0 +1,5 @@
|
||||
import { ESLintUtils } from '@typescript-eslint/utils'
|
||||
|
||||
export const createEslintRule = ESLintUtils.RuleCreator(
|
||||
ruleName => ruleName,
|
||||
)
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@antfu/eslint-config-react",
|
||||
"version": "0.19.2",
|
||||
"version": "0.19.4",
|
||||
"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": {
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@antfu/eslint-config-ts",
|
||||
"version": "0.19.2",
|
||||
"version": "0.19.4",
|
||||
"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"
|
||||
},
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@antfu/eslint-config-vue",
|
||||
"version": "0.19.2",
|
||||
"version": "0.19.4",
|
||||
"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": {
|
||||
|
1257
pnpm-lock.yaml
generated
1257
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user