From 0a708ab2f207578047aacd2bbae7d2e864ef9491 Mon Sep 17 00:00:00 2001 From: abdellah Date: Fri, 21 Oct 2022 16:04:08 +0300 Subject: [PATCH 1/6] ignore configuration files by default --- packages/vitest/src/defaults.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/vitest/src/defaults.ts b/packages/vitest/src/defaults.ts index 881bc0c3aee5..41675d1398bf 100644 --- a/packages/vitest/src/defaults.ts +++ b/packages/vitest/src/defaults.ts @@ -1,8 +1,7 @@ import type { BenchmarkUserOptions, ResolvedCoverageOptions, UserConfig } from './types' export const defaultInclude = ['**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'] -export const defaultExclude = ['**/node_modules/**', '**/dist/**', '**/cypress/**', '**/.{idea,git,cache,output,temp}/**'] - +export const defaultExclude = ['**/node_modules/**', '**/dist/**', '**/cypress/**', '**/.{idea,git,cache,output,temp}/**', 'vite.config.*', 'vitest.config.*'] export const benchmarkConfigDefaults: Required> = { include: ['**/*.{bench,benchmark}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], exclude: defaultExclude, From e1481540f2f8c5905aeb71dcc3be7e6fbd598c26 Mon Sep 17 00:00:00 2001 From: abdellah Date: Fri, 21 Oct 2022 16:05:24 +0300 Subject: [PATCH 2/6] add config exclude to the docs --- docs/config/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config/index.md b/docs/config/index.md index 64bcd6069b36..893abc6396e9 100644 --- a/docs/config/index.md +++ b/docs/config/index.md @@ -81,7 +81,7 @@ Files to include in the test run, using glob pattern. ### exclude - **Type:** `string[]` -- **Default:** `['**/node_modules/**', '**/dist/**', '**/cypress/**', '**/.{idea,git,cache,output,temp}/**']` +- **Default:** `['**/node_modules/**', '**/dist/**', '**/cypress/**', '**/.{idea,git,cache,output,temp}/**', 'vite.config.*', 'vitest.config.*']` Files to exclude from the test run, using glob pattern. From 6aff7420f4fa5fc93710ea60dc9034df1137f67d Mon Sep 17 00:00:00 2001 From: Abdellah Alaoui Solaimani Date: Fri, 21 Oct 2022 17:28:10 +0300 Subject: [PATCH 3/6] Update packages/vitest/src/defaults.ts Co-authored-by: Vladimir --- packages/vitest/src/defaults.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vitest/src/defaults.ts b/packages/vitest/src/defaults.ts index 41675d1398bf..81115443b225 100644 --- a/packages/vitest/src/defaults.ts +++ b/packages/vitest/src/defaults.ts @@ -1,7 +1,7 @@ import type { BenchmarkUserOptions, ResolvedCoverageOptions, UserConfig } from './types' export const defaultInclude = ['**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'] -export const defaultExclude = ['**/node_modules/**', '**/dist/**', '**/cypress/**', '**/.{idea,git,cache,output,temp}/**', 'vite.config.*', 'vitest.config.*'] +export const defaultExclude = ['**/node_modules/**', '**/dist/**', '**/cypress/**', '**/.{idea,git,cache,output,temp}/**', '{vite,vitest}.config.*'] export const benchmarkConfigDefaults: Required> = { include: ['**/*.{bench,benchmark}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], exclude: defaultExclude, From c84de8d013b38031b6a5afcac7617aa058a1b228 Mon Sep 17 00:00:00 2001 From: abdellah Date: Fri, 21 Oct 2022 17:29:54 +0300 Subject: [PATCH 4/6] add config to default coverage excludes --- packages/vitest/src/defaults.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/vitest/src/defaults.ts b/packages/vitest/src/defaults.ts index 81115443b225..206756945d93 100644 --- a/packages/vitest/src/defaults.ts +++ b/packages/vitest/src/defaults.ts @@ -22,6 +22,7 @@ const defaultCoverageExcludes = [ '**/__tests__/**', '**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress}.config.{js,cjs,mjs,ts}', '**/.{eslint,mocha,prettier}rc.{js,cjs,yml}', + '{vite,vitest}.config.*', ] const coverageConfigDefaults = { From 9871e1307f4eb80527bb36a51fbf9ac72de317fe Mon Sep 17 00:00:00 2001 From: abdellah Date: Fri, 21 Oct 2022 17:32:00 +0300 Subject: [PATCH 5/6] add coverage exclude to docs --- docs/config/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config/index.md b/docs/config/index.md index 893abc6396e9..c51532c2f192 100644 --- a/docs/config/index.md +++ b/docs/config/index.md @@ -536,7 +536,7 @@ List of files included in coverage as glob patterns ##### exclude - **Type:** `string[]` -- **Default:** `[]` +- **Default:** `['coverage/**', 'dist/**', 'packages/*/test{,s}/**', '**/*.d.ts', 'cypress/**', 'test{,s}/**', 'test{,-*}.{js,cjs,mjs,ts,tsx,jsx}', '**/*{.,-}test.{js,cjs,mjs,ts,tsx,jsx}', '**/*{.,-}spec.{js,cjs,mjs,ts,tsx,jsx}', '**/__tests__/**', '**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress}.config.{js,cjs,mjs,ts}', '**/.{eslint,mocha,prettier}rc.{js,cjs,yml}', '{vite,vitest}.config.*']` List of files excluded from coverage as glob patterns. From d4ef2ac3aff8e50667f2576b8926194680d9aad2 Mon Sep 17 00:00:00 2001 From: abdellah Date: Fri, 21 Oct 2022 17:52:15 +0300 Subject: [PATCH 6/6] exclude other config files and update docs --- docs/config/index.md | 4 ++-- packages/vitest/src/defaults.ts | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/config/index.md b/docs/config/index.md index c51532c2f192..c28425929c18 100644 --- a/docs/config/index.md +++ b/docs/config/index.md @@ -81,7 +81,7 @@ Files to include in the test run, using glob pattern. ### exclude - **Type:** `string[]` -- **Default:** `['**/node_modules/**', '**/dist/**', '**/cypress/**', '**/.{idea,git,cache,output,temp}/**', 'vite.config.*', 'vitest.config.*']` +- **Default:** `['**/node_modules/**', '**/dist/**', '**/cypress/**', '**/.{idea,git,cache,output,temp}/**', '**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress}.config.*']` Files to exclude from the test run, using glob pattern. @@ -536,7 +536,7 @@ List of files included in coverage as glob patterns ##### exclude - **Type:** `string[]` -- **Default:** `['coverage/**', 'dist/**', 'packages/*/test{,s}/**', '**/*.d.ts', 'cypress/**', 'test{,s}/**', 'test{,-*}.{js,cjs,mjs,ts,tsx,jsx}', '**/*{.,-}test.{js,cjs,mjs,ts,tsx,jsx}', '**/*{.,-}spec.{js,cjs,mjs,ts,tsx,jsx}', '**/__tests__/**', '**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress}.config.{js,cjs,mjs,ts}', '**/.{eslint,mocha,prettier}rc.{js,cjs,yml}', '{vite,vitest}.config.*']` +- **Default:** `['coverage/**', 'dist/**', 'packages/*/test{,s}/**', '**/*.d.ts', 'cypress/**', 'test{,s}/**', 'test{,-*}.{js,cjs,mjs,ts,tsx,jsx}', '**/*{.,-}test.{js,cjs,mjs,ts,tsx,jsx}', '**/*{.,-}spec.{js,cjs,mjs,ts,tsx,jsx}', '**/__tests__/**', '**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress}.config.{js,cjs,mjs,ts}', '**/.{eslint,mocha,prettier}rc.{js,cjs,yml}']` List of files excluded from coverage as glob patterns. diff --git a/packages/vitest/src/defaults.ts b/packages/vitest/src/defaults.ts index 206756945d93..597ade0dc909 100644 --- a/packages/vitest/src/defaults.ts +++ b/packages/vitest/src/defaults.ts @@ -1,7 +1,7 @@ import type { BenchmarkUserOptions, ResolvedCoverageOptions, UserConfig } from './types' export const defaultInclude = ['**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'] -export const defaultExclude = ['**/node_modules/**', '**/dist/**', '**/cypress/**', '**/.{idea,git,cache,output,temp}/**', '{vite,vitest}.config.*'] +export const defaultExclude = ['**/node_modules/**', '**/dist/**', '**/cypress/**', '**/.{idea,git,cache,output,temp}/**', '**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress}.config.*'] export const benchmarkConfigDefaults: Required> = { include: ['**/*.{bench,benchmark}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], exclude: defaultExclude, @@ -20,9 +20,8 @@ const defaultCoverageExcludes = [ '**/*{.,-}test.{js,cjs,mjs,ts,tsx,jsx}', '**/*{.,-}spec.{js,cjs,mjs,ts,tsx,jsx}', '**/__tests__/**', - '**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress}.config.{js,cjs,mjs,ts}', + '**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress}.config.*', '**/.{eslint,mocha,prettier}rc.{js,cjs,yml}', - '{vite,vitest}.config.*', ] const coverageConfigDefaults = {