Skip to content

Commit

Permalink
fix: export flat configs
Browse files Browse the repository at this point in the history
  • Loading branch information
aladdin-add committed Feb 23, 2024
1 parent da9d6b2 commit 4349f42
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 15 deletions.
34 changes: 27 additions & 7 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -277,17 +277,37 @@ const mod = {
}
}

const baseConfig = { plugins: { vue: mod } }

Object.assign(mod.configs, {
'flat/base': require('./configs/flat/base.js'),
'flat/base': Object.assign(baseConfig, require('./configs/flat/base.js')),

'flat/vue2-essential': require('./configs/flat/vue2-essential.js'),
'flat/vue2-recommended': require('./configs/flat/vue2-recommended.js'),
'flat/vue2-strongly-recommended': require('./configs/flat/vue2-strongly-recommended.js'),
'flat/vue2-essential': Object.assign(
baseConfig,
require('./configs/flat/vue2-essential.js')
),
'flat/vue2-recommended': Object.assign(
baseConfig,
require('./configs/flat/vue2-recommended.js')
),
'flat/vue2-strongly-recommended': Object.assign(
baseConfig,
require('./configs/flat/vue2-strongly-recommended.js')
),

// in flat configs, non-prefixed config is for Vue 3 (unlike eslintrc configs)
'flat/essential': require('./configs/flat/vue3-essential.js'),
'flat/recommended': require('./configs/flat/vue3-recommended.js'),
'flat/strongly-recommended': require('./configs/flat/vue3-strongly-recommended.js')
'flat/essential': Object.assign(
baseConfig,
require('./configs/flat/vue3-essential.js')
),
'flat/recommended': Object.assign(
baseConfig,
require('./configs/flat/vue3-recommended.js')
),
'flat/strongly-recommended': Object.assign(
baseConfig,
require('./configs/flat/vue3-strongly-recommended.js')
)
})

module.exports = mod
3 changes: 2 additions & 1 deletion tests/lib/configs/configs.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
const { ESLint } = require('../../eslint-compat')
const plugin = require('../../../lib/index')

describe('configs', () => {
// TODO: test flat configs

Check warning on line 6 in tests/lib/configs/configs.js

View workflow job for this annotation

GitHub Actions / Lint

Unexpected 'todo' comment: 'TODO: test flat configs'
describe('eslintrc configs', () => {
for (const name of Object.keys(plugin.configs)) {
if (name.startsWith('flat/')) {
continue
Expand Down
16 changes: 9 additions & 7 deletions tools/update-lib-index.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,19 @@ const mod = {
}
}
const baseConfig = {plugins: {vue: mod}}
Object.assign(mod.configs, {
'flat/base': require('./configs/flat/base.js'),
'flat/base': Object.assign(baseConfig, require('./configs/flat/base.js')),
'flat/vue2-essential': require('./configs/flat/vue2-essential.js'),
'flat/vue2-recommended': require('./configs/flat/vue2-recommended.js'),
'flat/vue2-strongly-recommended': require('./configs/flat/vue2-strongly-recommended.js'),
'flat/vue2-essential': Object.assign(baseConfig, require('./configs/flat/vue2-essential.js')),
'flat/vue2-recommended': Object.assign(baseConfig, require('./configs/flat/vue2-recommended.js')),
'flat/vue2-strongly-recommended': Object.assign(baseConfig, require('./configs/flat/vue2-strongly-recommended.js')),
// in flat configs, non-prefixed config is for Vue 3 (unlike eslintrc configs)
'flat/essential': require('./configs/flat/vue3-essential.js'),
'flat/recommended': require('./configs/flat/vue3-recommended.js'),
'flat/strongly-recommended': require('./configs/flat/vue3-strongly-recommended.js'),
'flat/essential': Object.assign(baseConfig, require('./configs/flat/vue3-essential.js')),
'flat/recommended': Object.assign(baseConfig, require('./configs/flat/vue3-recommended.js')),
'flat/strongly-recommended': Object.assign(baseConfig, require('./configs/flat/vue3-strongly-recommended.js')),
})
module.exports = mod
Expand Down

0 comments on commit 4349f42

Please sign in to comment.