wip: default of skipSelf is now true

vitejs · Sep 30, 2023 · 49dafa0 · 49dafa0
1 parent ddde37f
commit 49dafa0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts
@@ -252,7 +252,9 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
           }
         }
 
-        const resolved = await this.resolve(url, importerFile)
+        const resolved = await this.resolve(url, importerFile, {
+          skipSelf: false,
+        })
 
         if (!resolved) {
           // in ssr, we should let node handle the missing modules

diff --git a/packages/vite/src/node/plugins/optimizedDeps.ts b/packages/vite/src/node/plugins/optimizedDeps.ts
@@ -102,10 +102,7 @@ export function optimizedDepsBuildPlugin(config: ResolvedConfig): Plugin {
           // When a optimized dep is aliased, we need to avoid waiting for it before optimizing
           return
         }
-        const resolved = await this.resolve(id, importer, {
-          ...options,
-          skipSelf: true,
-        })
+        const resolved = await this.resolve(id, importer, options)
         if (resolved && !resolved.external) {
           depsOptimizer.delayDepsOptimizerUntil(resolved.id, async () => {
             await this.load(resolved)

diff --git a/packages/vite/src/node/plugins/preAlias.ts b/packages/vite/src/node/plugins/preAlias.ts
@@ -56,7 +56,6 @@ export function preAliasPlugin(config: ResolvedConfig): Plugin {
           const resolved = await this.resolve(id, importer, {
             ...options,
             custom: { ...options.custom, 'vite:pre-alias': true },
-            skipSelf: true,
           })
           if (resolved && !depsOptimizer.isOptimizedDepFile(resolved.id)) {
             const optimizeDeps = depsOptimizer.options

diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts
@@ -331,7 +331,7 @@ export async function createPluginContainer(
       },
     ) {
       let skip: Set<Plugin> | undefined
-      if (options?.skipSelf && this._activePlugin) {
+      if (options?.skipSelf !== false && this._activePlugin) {
         skip = new Set(this._resolveSkips)
         skip.add(this._activePlugin)
       }