Skip to content

Commit 0e48146

Browse files
committed
fix: try
1 parent 1fccbb8 commit 0e48146

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

src/core/options.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ export function resolveOptions(options: Options, root: string): ResolvedOptions
3838
resolved.extensions = toArray(resolved.extensions)
3939

4040
if (resolved.globs) {
41-
resolved.globs = toArray(resolved.globs).map((glob: string) => resolveGlobsExclude(root, glob))
41+
resolved.globs = toArray(resolved.globs)
42+
.map(glob => resolveGlobsExclude(root, glob))
4243
resolved.resolvedDirs = []
4344
}
4445
else {
@@ -59,7 +60,17 @@ export function resolveOptions(options: Options, root: string): ResolvedOptions
5960
}
6061

6162
if (!resolved.globsExclude)
62-
resolved.globsExclude = [resolveGlobsExclude(root, `**/node_modules/**`)]
63+
resolved.globsExclude = [`**/node_modules/**`]
64+
resolved.globsExclude = toArray(resolved.globsExclude || [])
65+
.map(i => resolveGlobsExclude(root, i))
66+
67+
// Move negated globs to globsExclude
68+
resolved.globs = resolved.globs.filter((i) => {
69+
if (!i.startsWith('!'))
70+
return true
71+
resolved.globsExclude.push(i.slice(1))
72+
return false
73+
})
6374

6475
resolved.dts = !resolved.dts
6576
? false

src/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ export type ResolvedOptions = Omit<
209209
dirs: string[]
210210
resolvedDirs: string[]
211211
globs: string[]
212+
globsExclude: string[]
212213
dts: string | false
213214
root: string
214215
}

test/search.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ describe('search', () => {
6161
const ctx = new Context({
6262
dirs: [
6363
'src/components',
64-
'!src/components/book/**',
64+
'!src/components/book',
6565
],
6666
})
6767
ctx.setRoot(root)

vitest.config.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ import { defineConfig } from 'vite'
22

33
export default defineConfig({
44
test: {
5-
deps: {
6-
inline: [
7-
'@babel/types',
8-
],
5+
server: {
6+
deps: {
7+
inline: [
8+
'@babel/types',
9+
],
10+
},
911
},
1012
},
1113
})

0 commit comments

Comments
 (0)