fix: revert resolve nested dependencies #3753 (#4019)

Fixes #4005
vitejs · Jun 29, 2021 · b6f4293 · b6f4293
1 parent c08069c
commit b6f4293
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/playground/nested-deps/__tests__/nested-deps.spec.ts b/packages/playground/nested-deps/__tests__/nested-deps.spec.ts
@@ -1,4 +1,5 @@
-test('handle nested package', async () => {
+// TODO: Rework #3753, taking into account issues with #4005, #4012, #4014
+test.skip('handle nested package', async () => {
   expect(await page.textContent('.a')).toBe('A@2.0.0')
   expect(await page.textContent('.b')).toBe('B@1.0.0')
   expect(await page.textContent('.nested-a')).toBe('A@1.0.0')

diff --git a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
@@ -94,7 +94,7 @@ export function esbuildDepPlugin(
                 namespace: 'dep'
               }
             : {
-                path: require.resolve(id, {
+                path: require.resolve(qualified[flatId], {
                   paths: [resolveDir]
                 })
               }