Skip to content

Commit 6587d2f

Browse files
authored
fix: revert #11290 (#11412)
1 parent 0a07686 commit 6587d2f

File tree

12 files changed

+5
-127
lines changed

12 files changed

+5
-127
lines changed

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

+5-7
Original file line numberDiff line numberDiff line change
@@ -874,15 +874,13 @@ export async function tryOptimizedResolve(
874874

875875
const metadata = depsOptimizer.metadata
876876

877-
if (!importer) {
878-
// no importer. try our best to find an optimized dep
879-
const depInfo = optimizedDepInfoFromId(metadata, id)
880-
if (depInfo) {
881-
return depsOptimizer.getOptimizedDepId(depInfo)
882-
}
883-
return
877+
const depInfo = optimizedDepInfoFromId(metadata, id)
878+
if (depInfo) {
879+
return depsOptimizer.getOptimizedDepId(depInfo)
884880
}
885881

882+
if (!importer) return
883+
886884
// further check if id is imported by nested dependency
887885
let resolvedSrc: string | undefined
888886

playground/resolve-optimized-dup-deps/__tests__/resolve-optimized-dup-deps.spec.ts

-7
This file was deleted.

playground/resolve-optimized-dup-deps/index.html

-17
This file was deleted.

playground/resolve-optimized-dup-deps/package-a/index.js

-6
This file was deleted.

playground/resolve-optimized-dup-deps/package-a/package.json

-9
This file was deleted.

playground/resolve-optimized-dup-deps/package-b-v1/index.js

-3
This file was deleted.

playground/resolve-optimized-dup-deps/package-b-v1/package.json

-6
This file was deleted.

playground/resolve-optimized-dup-deps/package-b-v2/index.js

-3
This file was deleted.

playground/resolve-optimized-dup-deps/package-b-v2/package.json

-6
This file was deleted.

playground/resolve-optimized-dup-deps/package.json

-15
This file was deleted.

playground/resolve-optimized-dup-deps/vite.config.js

-8
This file was deleted.

pnpm-lock.yaml

-40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)