fix: file dir resolve should prioritize package.json

vitejs · Jan 23, 2021 · ce2d49a · ce2d49a
1 parent 80473c1
commit ce2d49a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -252,16 +252,16 @@ function tryResolveFile(
   if (fs.existsSync(file)) {
     const isDir = fs.statSync(file).isDirectory()
     if (isDir) {
-      if (tryIndex) {
-        const index = tryFsResolve(file + '/index', isProduction, false)
-        if (index) return normalizePath(index) + query
-      }
       const pkgPath = file + '/package.json'
       if (fs.existsSync(pkgPath)) {
         // path points to a node package
         const pkg = loadPackageData(pkgPath)
         return resolvePackageEntry(file, pkg, isProduction)
       }
+      if (tryIndex) {
+        const index = tryFsResolve(file + '/index', isProduction, false)
+        if (index) return normalizePath(index) + query
+      }
     } else {
       return normalizePath(file) + query
     }