Skip to content

Commit f678442

Browse files
authored
refactor: use applyToEnvironment in internal plugins (#19588)
1 parent e3f6ae1 commit f678442

File tree

5 files changed

+28
-19
lines changed

5 files changed

+28
-19
lines changed

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

+6-3
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,13 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
4444

4545
return {
4646
name: 'vite:asset-import-meta-url',
47+
48+
applyToEnvironment(environment) {
49+
return environment.config.consumer === 'client'
50+
},
51+
4752
async transform(code, id) {
48-
const { environment } = this
4953
if (
50-
environment.config.consumer === 'client' &&
5154
id !== preloadHelperId &&
5255
id !== CLIENT_ENTRY &&
5356
code.includes('new URL') &&
@@ -121,7 +124,7 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
121124
tryIndex: false,
122125
preferRelative: true,
123126
})
124-
file = await assetResolver(environment, url, id)
127+
file = await assetResolver(this.environment, url, id)
125128
file ??=
126129
url[0] === '/'
127130
? slash(path.join(publicDir, url))

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import aliasPlugin, { type ResolverFunction } from '@rollup/plugin-alias'
22
import type { ObjectHook } from 'rollup'
33
import type { PluginHookUtils, ResolvedConfig } from '../config'
4-
import { isDepOptimizationDisabled } from '../optimizer'
54
import type { HookHandler, Plugin, PluginWithRequiredHook } from '../plugin'
65
import { watchPackageDataPlugin } from '../packages'
76
import { jsonPlugin } from './json'
@@ -36,17 +35,12 @@ export async function resolvePlugins(
3635
? await (await import('../build')).resolveBuildPlugins(config)
3736
: { pre: [], post: [] }
3837
const { modulePreload } = config.build
39-
const depOptimizationEnabled =
40-
!isBuild &&
41-
Object.values(config.environments).some(
42-
(environment) => !isDepOptimizationDisabled(environment.optimizeDeps),
43-
)
4438

4539
return [
46-
depOptimizationEnabled ? optimizedDepsPlugin() : null,
40+
!isBuild ? optimizedDepsPlugin() : null,
4741
isBuild ? metadataPlugin() : null,
4842
!isWorker ? watchPackageDataPlugin(config.packageCache) : null,
49-
preAliasPlugin(config),
43+
!isBuild ? preAliasPlugin(config) : null,
5044
aliasPlugin({
5145
entries: config.resolve.alias,
5246
customResolver: viteAliasCustomResolver,

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

+8-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ import {
88
ERR_OPTIMIZE_DEPS_PROCESSING_ERROR,
99
} from '../constants'
1010
import { createDebugger } from '../utils'
11-
import { optimizedDepInfoFromFile } from '../optimizer'
11+
import {
12+
isDepOptimizationDisabled,
13+
optimizedDepInfoFromFile,
14+
} from '../optimizer'
1215
import { cleanUrl } from '../../shared/utils'
1316
import { ERR_OUTDATED_OPTIMIZED_DEP } from '../../shared/constants'
1417

@@ -18,6 +21,10 @@ export function optimizedDepsPlugin(): Plugin {
1821
return {
1922
name: 'vite:optimized-deps',
2023

24+
applyToEnvironment(environment) {
25+
return !isDepOptimizationDisabled(environment.config.optimizeDeps)
26+
},
27+
2128
resolveId(id) {
2229
const environment = this.environment as DevEnvironment
2330
if (environment.depsOptimizer?.isOptimizedDepFile(id)) {

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import type {
44
Alias,
55
AliasOptions,
66
DepOptimizationOptions,
7+
DevEnvironment,
78
ResolvedConfig,
89
} from '..'
910
import type { Plugin } from '../plugin'
@@ -14,6 +15,7 @@ import {
1415
moduleListContains,
1516
} from '../utils'
1617
import { cleanUrl, withTrailingSlash } from '../../shared/utils'
18+
import { isDepOptimizationDisabled } from '../optimizer'
1719
import { tryOptimizedResolve } from './resolve'
1820

1921
/**
@@ -23,11 +25,13 @@ export function preAliasPlugin(config: ResolvedConfig): Plugin {
2325
const findPatterns = getAliasPatterns(config.resolve.alias)
2426
return {
2527
name: 'vite:pre-alias',
28+
applyToEnvironment(environment) {
29+
return !isDepOptimizationDisabled(environment.config.optimizeDeps)
30+
},
2631
async resolveId(id, importer, options) {
27-
const { environment } = this
32+
const environment = this.environment as DevEnvironment
2833
const ssr = environment.config.consumer === 'server'
29-
const depsOptimizer =
30-
environment.mode === 'dev' ? environment.depsOptimizer : undefined
34+
const depsOptimizer = environment.depsOptimizer
3135
if (
3236
importer &&
3337
depsOptimizer &&

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -208,17 +208,18 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
208208
return {
209209
name: 'vite:worker-import-meta-url',
210210

211+
applyToEnvironment(environment) {
212+
return environment.config.consumer === 'client'
213+
},
214+
211215
shouldTransformCachedModule({ code }) {
212216
if (isBuild && config.build.watch && isIncludeWorkerImportMetaUrl(code)) {
213217
return true
214218
}
215219
},
216220

217221
async transform(code, id) {
218-
if (
219-
this.environment.config.consumer === 'client' &&
220-
isIncludeWorkerImportMetaUrl(code)
221-
) {
222+
if (isIncludeWorkerImportMetaUrl(code)) {
222223
let s: MagicString | undefined
223224
const cleanString = stripLiteral(code)
224225
const workerImportMetaUrlRE =

0 commit comments

Comments
 (0)