Skip to content

Commit 7a06a20

Browse files
Add .ts extensions to Node test runner entries (#1121)
Co-authored-by: Lars Kappert <[email protected]>
1 parent 7129753 commit 7a06a20

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

packages/knip/src/plugins/node/index.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,14 @@ const resolveConfig: ResolveConfig<PackageJson> = localConfig => {
1515

1616
const entries = [toProductionEntry('server.js')];
1717

18-
if (scripts && Object.keys(scripts).some(script => /(?<=^|\s)node\s(.*)--test/.test(scripts[script]))) {
19-
const patterns = ['**/*{.,-,_}test.?(c|m)js', '**/test-*.?(c|m)js', '**/test.?(c|m)js', '**/test/**/*.?(c|m)js'];
18+
if (scripts && Object.values(scripts).some(script => /(?<=^|\s)node\s(.*)--test/.test(script))) {
19+
// From https://nodejs.org/api/test.html#running-tests-from-the-command-line
20+
const patterns = [
21+
'**/*{.,-,_}test.{cjs,mjs,js,cts,mts,ts}',
22+
'**/test-*.{cjs,mjs,js,cts,mts,ts}',
23+
'**/test.{cjs,mjs,js,cts,mts,ts}',
24+
'**/test/**/*.{cjs,mjs,js,cts,mts,ts}',
25+
];
2026
entries.push(...patterns.map(id => toEntry(id)));
2127
}
2228

packages/knip/src/plugins/tsx/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const resolveConfig: ResolveConfig<PackageJson> = localConfig => {
2020

2121
const entries = [];
2222

23-
if (scripts && Object.keys(scripts).some(script => /(?<=^|\s)tsx\s(.*)--test/.test(scripts[script]))) {
23+
if (scripts && Object.values(scripts).some(script => /(?<=^|\s)tsx\s(.*)--test/.test(script))) {
2424
const patterns = [
2525
'**/*{.,-,_}test.?(c|m)(j|t)s',
2626
'**/test-*.?(c|m)(j|t)s',

packages/knip/src/plugins/vitest/index.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ const entry = ['**/*.{bench,test,test-d,spec}.?(c|m)[jt]s?(x)', ...mocks];
2424
const isVitestCoverageCommand = /vitest(.+)--coverage(?:\.enabled(?:=true)?)?/;
2525

2626
const hasScriptWithCoverage = (scripts: PackageJson['scripts']) =>
27-
scripts
28-
? Object.values(scripts).some(script => {
29-
return isVitestCoverageCommand.test(script);
30-
})
31-
: false;
27+
scripts ? Object.values(scripts).some(script => isVitestCoverageCommand.test(script)) : false;
3228

3329
const findConfigDependencies = (localConfig: ViteConfig, options: PluginOptions) => {
3430
const { manifest, cwd: dir } = options;

0 commit comments

Comments
 (0)