Skip to content

Commit 5d967b5

Browse files
committed
Revert "refactor: create extractFilter function"
This reverts commit ef35a81.
1 parent ef35a81 commit 5d967b5

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,19 +187,26 @@ export function getCachedFilterForPlugin<
187187
let filter: PluginFilter | TransformHookFilter | undefined
188188
switch (hookName) {
189189
case 'resolveId': {
190-
const rawFilter = extractFilter(plugin.resolveId)?.id
190+
const rawFilter =
191+
typeof plugin.resolveId === 'object'
192+
? plugin.resolveId.filter?.id
193+
: undefined
191194
filters.resolveId = createIdFilter(rawFilter)
192195
filter = filters.resolveId
193196
break
194197
}
195198
case 'load': {
196-
const rawFilter = extractFilter(plugin.load)?.id
199+
const rawFilter =
200+
typeof plugin.load === 'object' ? plugin.load.filter?.id : undefined
197201
filters.load = createIdFilter(rawFilter)
198202
filter = filters.load
199203
break
200204
}
201205
case 'transform': {
202-
const rawFilters = extractFilter(plugin.transform)
206+
const rawFilters =
207+
typeof plugin.transform === 'object'
208+
? plugin.transform.filter
209+
: undefined
203210
filters.transform = createFilterForTransform(
204211
rawFilters?.id,
205212
rawFilters?.code,
@@ -211,12 +218,6 @@ export function getCachedFilterForPlugin<
211218
return filter as FilterForPluginValue[H] | undefined
212219
}
213220

214-
function extractFilter<T extends Function, F>(
215-
hook: ObjectHook<T, { filter?: F }> | undefined,
216-
) {
217-
return hook && 'filter' in hook && hook.filter ? hook.filter : undefined
218-
}
219-
220221
// Same as `@rollup/plugin-alias` default resolver, but we attach additional meta
221222
// if we can't resolve to something, which will error in `importAnalysis`
222223
export const viteAliasCustomResolver: ResolverFunction = async function (

0 commit comments

Comments
 (0)