Merge branch 'main' of https://github.com/antfu/eslint-config into fe…

…at/cli-presets
antfu · Mar 13, 2024 · b5999f7 · b5999f7
2 parents 1561293 + d41a5f0
commit b5999f7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/cli/stages/update-eslint-files.ts b/src/cli/stages/update-eslint-files.ts
@@ -57,7 +57,8 @@ ${result.template !== Template.Vanilla ? `${result.template}: true,` : ''}
   const files = fs.readdirSync(cwd)
   const legacyConfig: string[] = []
   files.forEach((file) => {
-    if (file.includes('eslint') || file.includes('prettier'))
+    if (/eslint|prettier/.test(file)
+      && !/eslint.config./.test(file))
       legacyConfig.push(file)
   })
 

diff --git a/src/globs.ts b/src/globs.ts
@@ -72,6 +72,7 @@ export const GLOB_EXCLUDE = [
   '**/.cache',
   '**/.output',
   '**/.vite-inspect',
+  '**/.yarn',
 
   '**/CHANGELOG*.md',
   '**/*.min.*',

diff --git a/test/cli.spec.ts b/test/cli.spec.ts
@@ -85,7 +85,7 @@ it('suggest remove unnecessary files', async () => {
   const { stdout } = await run()
 
   expect(stdout).toContain('You can now remove those files manually')
-  expect(stdout).toContain('.eslintignore, .eslintrc.yml, .prettierc, .prettierignore, eslint.config.js')
+  expect(stdout).toContain('.eslintignore, .eslintrc.yml, .prettierc, .prettierignore')
 })
 
 it('react template', async () => {