diff --git a/src/configs/formatters.ts b/src/configs/formatters.ts index 4877e381eb..53afaf1715 100644 --- a/src/configs/formatters.ts +++ b/src/configs/formatters.ts @@ -1,26 +1,17 @@ import * as parserPlain from 'eslint-parser-plain' -import { - GLOB_CSS, - GLOB_LESS, - GLOB_MARKDOWN, - GLOB_MDX, - GLOB_POSTCSS, - GLOB_SCSS, -} from '../globs' +import { GLOB_CSS, GLOB_LESS, GLOB_MARKDOWN, GLOB_MDX, GLOB_POSTCSS, GLOB_SCSS } from '../globs' import type { VendoredPrettierOptions } from '../vender/prettier-types' import { ensurePackages, interopDefault } from '../utils' -import type { - FlatConfigItem, - OptionsFormatters, - StylisticConfig, -} from '../types' +import type { FlatConfigItem, OptionsFormatters, StylisticConfig } from '../types' import { StylisticConfigDefaults } from './stylistic' export async function formatters( options: OptionsFormatters | true = {}, stylistic: StylisticConfig = {}, ): Promise { - await ensurePackages(['eslint-plugin-format']) + await ensurePackages([ + 'eslint-plugin-format', + ]) if (options === true) { options = { @@ -32,7 +23,11 @@ export async function formatters( } } - const { indent, quotes, semi } = { + const { + indent, + quotes, + semi, + } = { ...StylisticConfigDefaults, ...stylistic, } @@ -161,7 +156,9 @@ export async function formatters( } if (options.markdown) { - const formatter = options.markdown === true ? 'prettier' : options.markdown + const formatter = options.markdown === true + ? 'prettier' + : options.markdown configs.push( { diff --git a/src/configs/markdown.ts b/src/configs/markdown.ts index 0b553bab26..6043db5f56 100644 --- a/src/configs/markdown.ts +++ b/src/configs/markdown.ts @@ -1,17 +1,15 @@ import * as mdx from 'eslint-plugin-mdx' -import type { - FlatConfigItem, - OptionsComponentExts, - OptionsFiles, - OptionsOverrides, -} from '../types' +import type { FlatConfigItem, OptionsComponentExts, OptionsFiles, OptionsOverrides } from '../types' import { GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_OR_MDX } from '../globs' export async function markdown( options: OptionsFiles & OptionsComponentExts & OptionsOverrides = {}, ): Promise { - const { componentExts = [], overrides = {} } = options + const { + componentExts = [], + overrides = {}, + } = options return [ { diff --git a/src/globs.ts b/src/globs.ts index 9361234f8a..aa7a89fe78 100644 --- a/src/globs.ts +++ b/src/globs.ts @@ -19,8 +19,8 @@ export const GLOB_JSONC = '**/*.jsonc' export const GLOB_MARKDOWN = '**/*.md' export const GLOB_MDX = '**/*.mdx' -export const GLOB_MARKDOWN_OR_MDX = '**/*.mdx?' -export const GLOB_MARKDOWN_OR_MDX_IN_MARKDOWN_OR_MDX = '**/*.mdx?/*.mdx?' +export const GLOB_MARKDOWN_OR_MDX = '**/*.md?(x)' +export const GLOB_MARKDOWN_OR_MDX_IN_MARKDOWN_OR_MDX = '**/*.md?(x)/*.md?(x)' export const GLOB_VUE = '**/*.vue' export const GLOB_YAML = '**/*.y?(a)ml' export const GLOB_HTML = '**/*.htm?(l)'