Use basename comparison instead

parcel-bundler · Apr 7, 2022 · 88735fa · 88735fa
1 parent 7845dc3
commit 88735fa
Show file tree

Hide file tree

Showing 2 changed files with 225 additions and 5 deletions.
diff --git a/packages/utils/node-resolver-core/src/NodeResolver.js b/packages/utils/node-resolver-core/src/NodeResolver.js
@@ -779,7 +779,6 @@ export default class NodeResolver {
           let res =
             (await this.loadAsFile({
               file: entry.filename,
-              asPackageEntry: true,
               extensions,
               env,
               pkg,
@@ -973,14 +972,12 @@ export default class NodeResolver {
     extensions,
     env,
     pkg,
-    asPackageEntry,
     ctx,
   }: {|
     file: string,
     extensions: Array<string>,
     env: Environment,
     pkg: InternalPackageJSON | null,
-    asPackageEntry?: boolean,
     ctx: ResolverContext,
   |}): Promise<?ResolvedFile> {
     // Try all supported extensions
@@ -1002,9 +999,12 @@ export default class NodeResolver {
     if (found) {
       return {
         path: found,
-        // If this is an entrypoint in package.json, it's possible pkg is not the
+        // If this package.json isn't a sibling of found, it's possible pkg is not the
         // closest package.json to the resolved file. Reload it instead.
-        pkg: asPackageEntry ? await this.findPackage(found, ctx) : pkg,
+        pkg:
+          pkg == null || pkg?.pkgdir !== path.basename(found)
+            ? await this.findPackage(found, ctx)
+            : pkg,
       };
     }