fix(resolve): normalize node_modules and bare imports, fix #2503 (#2848)

Co-authored-by: Anthony Fu <anthonyfu117@hotmail.com>
vitejs · May 4, 2021 · 0c97412 · 0c97412
1 parent 2421deb
commit 0c97412
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -124,6 +124,26 @@ export function resolvePlugin(baseOptions: InternalResolveOptions): Plugin {
         const fsPath = path.resolve(basedir, id)
         // handle browser field mapping for relative imports
 
+        const normalizedFsPath = normalizePath(fsPath)
+        const pathFromBasedir = normalizedFsPath.slice(basedir.length)
+        if (pathFromBasedir.startsWith('/node_modules/')) {
+          // normalize direct imports from node_modules to bare imports, so the
+          // hashing logic is shared and we avoid duplicated modules #2503
+          const bareImport = pathFromBasedir.slice('/node_modules/'.length)
+          if (
+            (res = tryNodeResolve(
+              bareImport,
+              importer,
+              options,
+              ssr,
+              server
+            )) &&
+            res.id.startsWith(normalizedFsPath)
+          ) {
+            return res
+          }
+        }
+
         if (
           !ssr &&
           (res = tryResolveBrowserMapping(fsPath, importer, options, true))