Skip to content

Commit 49dafa0

Browse files
committed
wip: default of skipSelf is now true
1 parent ddde37f commit 49dafa0

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,9 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
252252
}
253253
}
254254

255-
const resolved = await this.resolve(url, importerFile)
255+
const resolved = await this.resolve(url, importerFile, {
256+
skipSelf: false,
257+
})
256258

257259
if (!resolved) {
258260
// in ssr, we should let node handle the missing modules

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,7 @@ export function optimizedDepsBuildPlugin(config: ResolvedConfig): Plugin {
102102
// When a optimized dep is aliased, we need to avoid waiting for it before optimizing
103103
return
104104
}
105-
const resolved = await this.resolve(id, importer, {
106-
...options,
107-
skipSelf: true,
108-
})
105+
const resolved = await this.resolve(id, importer, options)
109106
if (resolved && !resolved.external) {
110107
depsOptimizer.delayDepsOptimizerUntil(resolved.id, async () => {
111108
await this.load(resolved)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ export function preAliasPlugin(config: ResolvedConfig): Plugin {
5656
const resolved = await this.resolve(id, importer, {
5757
...options,
5858
custom: { ...options.custom, 'vite:pre-alias': true },
59-
skipSelf: true,
6059
})
6160
if (resolved && !depsOptimizer.isOptimizedDepFile(resolved.id)) {
6261
const optimizeDeps = depsOptimizer.options

packages/vite/src/node/server/pluginContainer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ export async function createPluginContainer(
331331
},
332332
) {
333333
let skip: Set<Plugin> | undefined
334-
if (options?.skipSelf && this._activePlugin) {
334+
if (options?.skipSelf !== false && this._activePlugin) {
335335
skip = new Set(this._resolveSkips)
336336
skip.add(this._activePlugin)
337337
}

0 commit comments

Comments
 (0)