Skip to content

Commit

Permalink
fix: correct files glob.
Browse files Browse the repository at this point in the history
  • Loading branch information
lvjiaxuan committed Mar 9, 2023
1 parent 1e48871 commit a5de528
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 25 deletions.
6 changes: 5 additions & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import lvjiaxuan from '@lvjiaxuan/eslint-plugin/flat'

export default lvjiaxuan.configs.recommended
/** @type {import('eslint').Linter.FlatConfig} */
export default [
{ ignores: [ 'packages/typescript/tsRules.json' ] },
...lvjiaxuan.configs.recommended,
]
3 changes: 1 addition & 2 deletions packages/all/flat.mjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import eslint from 'eslint'
import vue from '@lvjiaxuan/eslint-config-vue/flat'

/**
* @type {Array.<eslint.Linter.FlatConfig>}
* @type {Array.<import('eslint').Linter.FlatConfig>}
*/
export default vue
3 changes: 1 addition & 2 deletions packages/eslint-plugin/src/flat.mjs
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import eslint from 'eslint'
import lvjiaxuan from '@lvjiaxuan/eslint-config/flat'
import index from './index'

const pluginRules = index.rules

/** @type {eslint.ESLint.Plugin} */
/** @type {import('eslint').ESLint.Plugin} */
export default {
configs: {
recommended: [
Expand Down
25 changes: 12 additions & 13 deletions packages/javascript/flat.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import jsoncPlugin from 'eslint-plugin-jsonc'
import markdownPlugin from 'eslint-plugin-markdown'
import ymlPlugin from 'eslint-plugin-yml'
import ymlParser from 'yaml-eslint-parser'
import eslint from 'eslint'
import globals from 'globals'
import js from '@eslint/js'
import index from './index'
Expand All @@ -13,14 +12,14 @@ import basic from './basic'

/**
* @description A temporary compat
* @param {eslint.ESLint.plugin} plugin
* @returns {eslint.Linter.FlatConfig}
* @param {import('eslint').ESLint.plugin} plugin
* @returns {import('eslint').Linter.FlatConfig}
*/
export const compatPluginConfig = (plugin, name = 'recommended') => {
// It seems that `@eslint/eslintrc` could only be used in `eslint.config.js` of root rather than packing it for import.
// So I need to do a temporary compatibility by myself.

/** @type {eslint.Linter.FlatConfig} */
/** @type {import('eslint').Linter.FlatConfig} */
const flatConfig = {}

flatConfig.plugins = { [plugin.configs[name].plugins[0]]: plugin }
Expand All @@ -30,13 +29,13 @@ export const compatPluginConfig = (plugin, name = 'recommended') => {
}

/**
* @returns {eslint.Linter.FlatConfig}
* @returns {import('eslint').Linter.FlatConfig}
*/
export const compatJsoncPluginConfig = () => ({
// jsoncPlugin.configs['recommended-with-jsonc']
// https://github.dev/ota-meshi/eslint-plugin-jsonc/blob/master/lib/index.ts#L45

files: jsoncPlugin.configs.base.overrides[0].files, // [ '**/*.json', '**/*.json5', '**/*.jsonc' ],
files: [ '**/*.json', '**/*.json5', '**/*.jsonc' ],
plugins: { jsonc: jsoncPlugin },
languageOptions: { parser: jsoncPlugin },
rules: {
Expand All @@ -46,12 +45,12 @@ export const compatJsoncPluginConfig = () => ({
})

/**
* @returns {Array.<eslint.Linter.FlatConfig>}
* @returns {Array.<import('eslint').Linter.FlatConfig>}
*/
export const compatYmlPluginConfig = () => ({
// ymlPlugin.configs.standard
// https://github.dev/ota-meshi/eslint-plugin-yml/blob/master/src/configs/standard.ts#L1
files: ymlPlugin.configs.base.overrides[0].files, // [ '**/*.yaml', '**/*.yml' ],
files: [ '**/*.yaml', '**/*.yml' ],
plugins: { yml: ymlPlugin },
languageOptions: { parser: ymlParser },
rules: {
Expand All @@ -61,7 +60,7 @@ export const compatYmlPluginConfig = () => ({
})

/**
* @returns {Array.<eslint.Linter.FlatConfig>}
* @returns {Array.<import('eslint').Linter.FlatConfig>}
*/
export const compatMarkdownPluginConfigs = () => {
// markdownPlugin.configs.recommended
Expand All @@ -70,17 +69,17 @@ export const compatMarkdownPluginConfigs = () => {

const recommended = markdownPlugin.configs.recommended

/** @type {eslint.Linter.FlatConfig} */
/** @type {import('eslint').Linter.FlatConfig} */
const flatA = {
files: recommended.overrides[0].files, // [ '**/*.md' ],
files: [ '**/*.md' ],
plugins: {
// markdown plugin name
[recommended.plugins[0]]: markdownPlugin,
},
processor: recommended.overrides[0].processor,
}

/** @type {eslint.Linter.FlatConfig} */
/** @type {import('eslint').Linter.FlatConfig} */
const flatB = {
files: recommended.overrides[1].files,
languageOptions: { parserOptions: recommended.overrides[1].parserOptions },
Expand All @@ -92,7 +91,7 @@ export const compatMarkdownPluginConfigs = () => {


/**
* @type {Array.<eslint.Linter.FlatConfig>}
* @type {Array.<import('eslint').Linter.FlatConfig>}
* @link https://eslint.org/docs/latest/use/configure/configuration-files-new
*/
export default [
Expand Down
2 changes: 1 addition & 1 deletion packages/javascript/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ module.exports = {
},
},
{
files: [ 'package.json' ],
files: [ '**/package.json' ],
// parser: 'jsonc-eslint-parser',
rules: {
'jsonc/sort-keys': [
Expand Down
3 changes: 1 addition & 2 deletions packages/typescript/flat.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import eslint from 'eslint'
import javascript from '@lvjiaxuan/eslint-config-js/flat'
import tsParser from '@typescript-eslint/parser'
import typescript from '@typescript-eslint/eslint-plugin'
Expand All @@ -7,7 +6,7 @@ import index from './index'
const config = index.overrides[0]

/**
* @type {Array.<eslint.Linter.FlatConfig>}
* @type {Array.<import('eslint').Linter.FlatConfig>}
*/
export default [
...javascript,
Expand Down
2 changes: 1 addition & 1 deletion packages/typescript/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = {

overrides: [
{
files: [ '*.ts', '*.tsx', '*.mts', '*.cts' ],
files: [ '**/*.ts', '**/*.tsx', '**/*.mts', '**/*.cts' ],

excludedFiles: [ '**/*.md/*.*' ],

Expand Down
3 changes: 1 addition & 2 deletions packages/vue/flat.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import eslint from 'eslint'
import typescript from '@lvjiaxuan/eslint-config-ts/flat'
import vue from 'eslint-plugin-vue'
import tsParser from '@typescript-eslint/parser'
Expand All @@ -12,7 +11,7 @@ import index from './index'
const files = [ '**/*.vue' ]

/**
* @type {Array.<eslint.Linter.FlatConfig>}
* @type {Array.<import('eslint').Linter.FlatConfig>}
*/
export default [
...typescript,
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = {

overrides: [
{
files: [ '*.vue' ],
files: [ '**/*.vue' ],
extends: [ 'plugin:vue/vue3-recommended', '@vue/eslint-config-typescript/recommended' ],
rules: {
'vue/no-unused-vars': 'off',
Expand Down

0 comments on commit a5de528

Please sign in to comment.