Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisbbreuer committed Jul 17, 2023
2 parents bbbe79e + bf390b0 commit 071e609
Show file tree
Hide file tree
Showing 13 changed files with 50 additions and 37 deletions.
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,16 @@ and then
npm i -D lint-staged simple-git-hooks
```

## Badge

If you enjoy this code style, and would like to mention it in your project, here is the badge you can use:

```md
[![code style](https://antfu.me/badge-code-style.svg)](https://github.com/antfu/eslint-config)
```

[![code style](https://antfu.me/badge-code-style.svg)](https://github.com/antfu/eslint-config)

## FAQ

### Prettier?
Expand Down
24 changes: 12 additions & 12 deletions fixtures/vitesse/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "module",
"private": true,
"packageManager": "pnpm@8.6.6",
"packageManager": "pnpm@8.6.7",
"scripts": {
"build": "vite-ssg build",
"dev": "vite --port 3333 --open",
Expand All @@ -15,15 +15,15 @@
"up": "taze major -I"
},
"dependencies": {
"@unocss/reset": "^0.53.4",
"@unocss/reset": "^0.53.5",
"@vueuse/core": "^10.2.1",
"@vueuse/head": "^1.1.26",
"nprogress": "^0.2.0",
"pinia": "^2.1.4",
"vue": "^3.3.4",
"vue-demi": "^0.14.5",
"vue-i18n": "^9.2.2",
"vue-router": "^4.2.2"
"vue-router": "^4.2.4"
},
"devDependencies": {
"@iconify-json/carbon": "^1.1.18",
Expand All @@ -35,28 +35,28 @@
"@vue/test-utils": "^2.4.0",
"critters": "^0.0.19",
"cross-env": "^7.0.3",
"cypress": "^12.16.0",
"eslint": "^8.44.0",
"cypress": "^12.17.1",
"eslint": "^8.45.0",
"eslint-plugin-cypress": "^2.13.3",
"https-localhost": "^4.7.1",
"markdown-it-link-attributes": "^4.0.1",
"markdown-it-shiki": "^0.9.0",
"pnpm": "^8.6.6",
"pnpm": "^8.6.7",
"shiki": "^0.14.3",
"taze": "^0.11.2",
"typescript": "^5.1.6",
"unocss": "^0.53.4",
"unplugin-auto-import": "^0.16.5",
"unocss": "^0.53.5",
"unplugin-auto-import": "^0.16.6",
"unplugin-vue-components": "^0.25.1",
"vite": "^4.3.9",
"vite-plugin-inspect": "^0.7.32",
"vite": "^4.4.4",
"vite-plugin-inspect": "^0.7.33",
"vite-plugin-pages": "^0.31.0",
"vite-plugin-pwa": "^0.16.4",
"vite-plugin-vue-layouts": "^0.8.0",
"vite-plugin-vue-markdown": "^0.23.5",
"vite-ssg": "^0.23.0",
"vite-ssg-sitemap": "^0.5.1",
"vitest": "^0.32.4",
"vue-tsc": "^1.8.3"
"vitest": "^0.33.0",
"vue-tsc": "^1.8.5"
}
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@ow3/eslint-config-monorepo",
"version": "0.45.2",
"private": true,
"packageManager": "pnpm@8.6.6",
"packageManager": "pnpm@8.6.7",
"author": "Chris Breuer <chris@ow3.org> (https://github.com/chrisbbreuer/)",
"license": "MIT",
"engines": {
Expand All @@ -21,8 +21,8 @@
"devDependencies": {
"@ow3/eslint-config": "workspace:*",
"bumpp": "^9.1.1",
"eslint": "^8.44.0",
"eslint-plugin-ow3": "link:packages/eslint-plugin-ow3",
"eslint": "^8.45.0",
"eslint-plugin-ow3": "link:./packages/eslint-plugin-ow3",
"rimraf": "^5.0.1",
"typescript": "^5.1.6"
}
Expand Down
3 changes: 2 additions & 1 deletion packages/eslint-config-basic/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ module.exports = {
'no-unused-vars': 'off',
'ow3/no-cjs-exports': 'off',
'ow3/no-ts-export-equal': 'off',
'n/prefer-global/process': 'off',
},
},
],
Expand Down Expand Up @@ -368,7 +369,7 @@ module.exports = {
'max-statements-per-line': ['error', { max: 1 }],

// node
// 'n/prefer-global/process': ['error', 'never'], // Not sure if we need it as we are using `process.env.NODE_ENV` a lot in front-end.
'n/prefer-global/process': ['error', 'never'],
'n/prefer-global/buffer': ['error', 'never'],
'n/no-callback-literal': 'off',

Expand Down
8 changes: 4 additions & 4 deletions packages/eslint-config-basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@
"dependencies": {
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-html": "^7.1.0",
"eslint-plugin-import": "npm:eslint-plugin-i@2.27.5-3",
"eslint-plugin-import": "npm:eslint-plugin-i@2.27.5-4",
"eslint-plugin-jsonc": "^2.9.0",
"eslint-plugin-markdown": "^3.0.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-no-only-tests": "^3.1.0",
"eslint-plugin-ow3": "workspace:*",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-unicorn": "^47.0.0",
"eslint-plugin-unused-imports": "^2.0.0",
"eslint-plugin-unicorn": "^48.0.0",
"eslint-plugin-unused-imports": "^3.0.0",
"eslint-plugin-yml": "^1.8.0",
"jsonc-eslint-parser": "^2.3.0",
"yaml-eslint-parser": "^1.2.2"
},
"devDependencies": {
"eslint": "^8.44.0"
"eslint": "^8.45.0"
}
}
2 changes: 1 addition & 1 deletion packages/eslint-config-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"eslint-plugin-react-hooks": "^4.6.0"
},
"devDependencies": {
"eslint": "^8.44.0",
"eslint": "^8.45.0",
"react": "^18.2.0",
"typescript": "^5.1.6"
}
Expand Down
1 change: 1 addition & 0 deletions packages/eslint-config-ts/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const fs = require('node:fs')
const { join } = require('node:path')
const process = require('node:process')
const basic = require('@ow3/eslint-config-basic')

const tsconfig = process.env.ESLINT_TSCONFIG || 'tsconfig.eslint.json'
Expand Down
10 changes: 5 additions & 5 deletions packages/eslint-config-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
},
"dependencies": {
"@ow3/eslint-config-basic": "workspace:*",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"eslint-plugin-jest": "^27.2.2",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"eslint-plugin-jest": "^27.2.3",
"eslint-plugin-neverthrow": "^1.1.4"
},
"devDependencies": {
"eslint": "^8.44.0"
"eslint": "^8.45.0"
}
}
}
4 changes: 2 additions & 2 deletions packages/eslint-config-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
"local-pkg": "^0.4.3"
},
"devDependencies": {
"eslint": "^8.44.0"
"eslint": "^8.45.0"
}
}
}
10 changes: 5 additions & 5 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
},
"dependencies": {
"@ow3/eslint-config-vue": "workspace:*",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-html": "^7.1.0",
"eslint-plugin-import": "npm:eslint-plugin-i@2.27.5-3",
"eslint-plugin-import": "npm:eslint-plugin-i@2.27.5-4",
"eslint-plugin-jsonc": "^2.9.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-unicorn": "^47.0.0",
"eslint-plugin-unicorn": "^48.0.0",
"eslint-plugin-vue": "^9.15.1",
"eslint-plugin-yml": "^1.8.0",
"jsonc-eslint-parser": "^2.3.0",
"yaml-eslint-parser": "^1.2.2"
},
"devDependencies": {
"eslint": "^8.44.0"
"eslint": "^8.45.0"
}
}
6 changes: 3 additions & 3 deletions packages/eslint-plugin-ow3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
},
"dependencies": {
"@stacksjs/path": "^0.52.0",
"@typescript-eslint/utils": "^5.61.0",
"@typescript-eslint/utils": "^6.0.0",
"@unocss/config": "0.51.6",
"@unocss/core": "0.51.6",
"synckit": "^0.8.5"
},
"devDependencies": {
"@types/node": "^20.3.3",
"@types/node": "^20.4.2",
"unbuild": "^1.2.1",
"vitest": "^0.32.4"
"vitest": "^0.33.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const valids = [
'import { type Foo } from \'foo\'',
'import type Foo from \'foo\'',
'import type * as Foo from \'foo\'',
'import type {} from \'foo\'',
]
const invalids = [
['import type { Foo } from \'foo\'', 'import { type Foo } from \'foo\''],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default createEslintRule<Options, MessageIds>({
// ignore bare type imports
if (node.specifiers.length === 1 && ['ImportNamespaceSpecifier', 'ImportDefaultSpecifier'].includes(node.specifiers[0].type))
return
if (node.importKind === 'type') {
if (node.importKind === 'type' && node.specifiers.length > 0) {
context.report({
*fix(fixer) {
yield * removeTypeSpecifier(fixer, sourceCode, node)
Expand Down

0 comments on commit 071e609

Please sign in to comment.