Skip to content

Commit 6eefaf4

Browse files
committed
refactor: skip hook filter inject in build
1 parent cfb5271 commit 6eefaf4

File tree

2 files changed

+10
-34
lines changed

2 files changed

+10
-34
lines changed

packages/vite/src/node/build.ts

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ import {
8181
} from './baseEnvironment'
8282
import type { MinimalPluginContext, Plugin, PluginContext } from './plugin'
8383
import type { RollupPluginHooks } from './typeUtils'
84-
import {
85-
createFilterForTransform,
86-
createIdFilter,
87-
} from './plugins/pluginFilter'
8884
import { buildOxcPlugin } from './plugins/oxc'
8985

9086
export interface BuildEnvironmentOptions {
@@ -597,7 +593,7 @@ async function buildEnvironment(
597593
// inject environment and ssr arg to plugin load/transform hooks
598594
const chunkMetadataMap = new Map<string, ChunkMetadata>()
599595
const plugins = environment.plugins.map((p) =>
600-
injectEnvironmentAndFilterToHooks(environment, chunkMetadataMap, p),
596+
injectEnvironmentToHooks(environment, chunkMetadataMap, p),
601597
)
602598

603599
const rollupOptions: RolldownOptions = {
@@ -1157,7 +1153,7 @@ function isExternal(id: string, test: string | RegExp) {
11571153
}
11581154
}
11591155

1160-
export function injectEnvironmentAndFilterToHooks(
1156+
export function injectEnvironmentToHooks(
11611157
environment: BuildEnvironment,
11621158
chunkMetadataMap: Map<string, ChunkMetadata>,
11631159
plugin: Plugin,
@@ -1169,13 +1165,13 @@ export function injectEnvironmentAndFilterToHooks(
11691165
for (const hook of Object.keys(clone) as RollupPluginHooks[]) {
11701166
switch (hook) {
11711167
case 'resolveId':
1172-
clone[hook] = wrapEnvironmentAndFilterResolveId(environment, resolveId)
1168+
clone[hook] = wrapEnvironmentResolveId(environment, resolveId)
11731169
break
11741170
case 'load':
1175-
clone[hook] = wrapEnvironmentAndFilterLoad(environment, load)
1171+
clone[hook] = wrapEnvironmentLoad(environment, load)
11761172
break
11771173
case 'transform':
1178-
clone[hook] = wrapEnvironmentAndFilterTransform(environment, transform)
1174+
clone[hook] = wrapEnvironmentTransform(environment, transform)
11791175
break
11801176
default:
11811177
if (ROLLUP_HOOKS.includes(hook)) {
@@ -1193,20 +1189,14 @@ export function injectEnvironmentAndFilterToHooks(
11931189
return clone
11941190
}
11951191

1196-
function wrapEnvironmentAndFilterResolveId(
1192+
function wrapEnvironmentResolveId(
11971193
environment: BuildEnvironment,
11981194
hook?: Plugin['resolveId'],
11991195
): Plugin['resolveId'] {
12001196
if (!hook) return
12011197

1202-
const rawIdFilter = typeof hook === 'object' ? hook.filter?.id : undefined
1203-
const idFilter = rawIdFilter ? createIdFilter(rawIdFilter) : undefined
1204-
12051198
const fn = getHookHandler(hook)
12061199
const handler: Plugin['resolveId'] = function (id, importer, options) {
1207-
if (idFilter && !idFilter(id)) {
1208-
return
1209-
}
12101200
return fn.call(
12111201
injectEnvironmentInContext(this, environment),
12121202
id,
@@ -1225,20 +1215,14 @@ function wrapEnvironmentAndFilterResolveId(
12251215
}
12261216
}
12271217

1228-
function wrapEnvironmentAndFilterLoad(
1218+
function wrapEnvironmentLoad(
12291219
environment: BuildEnvironment,
12301220
hook?: Plugin['load'],
12311221
): Plugin['load'] {
12321222
if (!hook) return
12331223

1234-
const rawIdFilter = typeof hook === 'object' ? hook.filter?.id : undefined
1235-
const idFilter = rawIdFilter ? createIdFilter(rawIdFilter) : undefined
1236-
12371224
const fn = getHookHandler(hook)
12381225
const handler: Plugin['load'] = function (id, ...args) {
1239-
if (idFilter && !idFilter(id)) {
1240-
return
1241-
}
12421226
return fn.call(
12431227
injectEnvironmentInContext(this, environment),
12441228
id,
@@ -1256,22 +1240,14 @@ function wrapEnvironmentAndFilterLoad(
12561240
}
12571241
}
12581242

1259-
function wrapEnvironmentAndFilterTransform(
1243+
function wrapEnvironmentTransform(
12601244
environment: BuildEnvironment,
12611245
hook?: Plugin['transform'],
12621246
): Plugin['transform'] {
12631247
if (!hook) return
12641248

1265-
const filters = typeof hook === 'object' ? hook.filter : undefined
1266-
const filter = filters
1267-
? createFilterForTransform(filters.id, filters.code)
1268-
: undefined
1269-
12701249
const fn = getHookHandler(hook)
12711250
const handler: Plugin['transform'] = function (code, importer, ...args) {
1272-
if (filter && !filter(importer, code)) {
1273-
return
1274-
}
12751251
return fn.call(
12761252
injectEnvironmentInContext(this, environment),
12771253
code,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
import {
1818
BuildEnvironment,
1919
createToImportMetaURLBasedRelativeRuntime,
20-
injectEnvironmentAndFilterToHooks,
20+
injectEnvironmentToHooks,
2121
onRollupLog,
2222
toOutputFilePathInJS,
2323
} from '../build'
@@ -98,7 +98,7 @@ async function bundleWorkerEntry(
9898
...rollupOptions,
9999
input,
100100
plugins: workerEnvironment.plugins.map((p) =>
101-
injectEnvironmentAndFilterToHooks(workerEnvironment, chunkMetadataMap, p),
101+
injectEnvironmentToHooks(workerEnvironment, chunkMetadataMap, p),
102102
),
103103
onLog(level, log) {
104104
onRollupLog(level, log, workerEnvironment)

0 commit comments

Comments
 (0)