From b6f4293435bf90c9a64476d8bfbb022f4f2af9a9 Mon Sep 17 00:00:00 2001 From: patak Date: Tue, 29 Jun 2021 14:46:24 +0200 Subject: [PATCH] fix: revert resolve nested dependencies #3753 (#4019) Fixes #4005 --- packages/playground/nested-deps/__tests__/nested-deps.spec.ts | 3 ++- packages/vite/src/node/optimizer/esbuildDepPlugin.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/playground/nested-deps/__tests__/nested-deps.spec.ts b/packages/playground/nested-deps/__tests__/nested-deps.spec.ts index 9b2fb9546dbcbb..4db6a5fc9406d8 100644 --- 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 index 1e2919b8101c68..7459c3b21e613a 100644 --- 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] }) }