From c046c653d54fdb1949c0be7f1a7cde2a984e4498 Mon Sep 17 00:00:00 2001 From: bluwy Date: Thu, 23 Mar 2023 16:51:16 +0800 Subject: [PATCH 1/2] perf(resolve): fix browser mapping nearest package.json check --- packages/vite/src/node/plugins/resolve.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts index 816bed066f3394..ed61e01dc90f18 100644 --- a/packages/vite/src/node/plugins/resolve.ts +++ b/packages/vite/src/node/plugins/resolve.ts @@ -1214,7 +1214,7 @@ function tryResolveBrowserMapping( const pkg = importer && (idToPkgMap.get(importer) || - findNearestPackageData(importer, options.packageCache)) + findNearestPackageData(path.dirname(importer), options.packageCache)) if (pkg && isObject(pkg.data.browser)) { const mapId = isFilePath ? './' + slash(path.relative(pkg.dir, id)) : id const browserMappedPath = mapWithBrowserField(mapId, pkg.data.browser) From 1cc21017004fba5076b00bbe55b0eeb5a5aa4003 Mon Sep 17 00:00:00 2001 From: bluwy Date: Thu, 23 Mar 2023 17:25:39 +0800 Subject: [PATCH 2/2] fix: handle one more place --- packages/vite/src/node/plugins/resolve.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts index ed61e01dc90f18..f2108ca4fdcb1d 100644 --- a/packages/vite/src/node/plugins/resolve.ts +++ b/packages/vite/src/node/plugins/resolve.ts @@ -842,8 +842,8 @@ export function tryNodeResolve( !( ext === '.cjs' || (ext === '.js' && - findNearestPackageData(resolved, options.packageCache)?.data.type !== - 'module') + findNearestPackageData(path.dirname(resolved), options.packageCache) + ?.data.type !== 'module') ) && !(include?.includes(pkgId) || include?.includes(id)))