module: fix check for package.json at volume root

GeoffreyBooth · GeoffreyBooth · commit a94a5ba7c355 · 2020-05-21T22:18:38.000-07:00
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -41,6 +41,7 @@ const{
 SafeMap,
 String,
 StringPrototypeIndexOf,
+ StringPrototypeLastIndexOf,
 StringPrototypeMatch,
 StringPrototypeSlice,
 StringPrototypeStartsWith,
@@ -286,12 +287,13 @@ function readPackageScope(checkPath){
 const rootSeparatorIndex = checkPath.indexOf(path.sep);
 let separatorIndex;
 while (
- (separatorIndex = checkPath.lastIndexOf(path.sep)) > rootSeparatorIndex
+ (separatorIndex = StringPrototypeLastIndexOf(checkPath, path.sep)) >=
+ rootSeparatorIndex
 ){
 checkPath = checkPath.slice(0, separatorIndex);
 if (checkPath.endsWith(path.sep + 'node_modules'))
 return false;
- const pjson = readPackage(checkPath);
+ const pjson = readPackage(checkPath + path.sep);
 if (pjson) return{
 path: checkPath,
 data: pjson

-Original file line number
+Diff line change
  SafeMap,
  String,
  StringPrototypeIndexOf,
 + StringPrototypeLastIndexOf,
  StringPrototypeMatch,
  StringPrototypeSlice,
  StringPrototypeStartsWith,
 constrootSeparatorIndex=checkPath.indexOf(path.sep);
 letseparatorIndex;
 while(
 -(separatorIndex=checkPath.lastIndexOf(path.sep))>rootSeparatorIndex
 +(separatorIndex=StringPrototypeLastIndexOf(checkPath,path.sep))>=
 +rootSeparatorIndex
 ){
 checkPath=checkPath.slice(0,separatorIndex);
 if(checkPath.endsWith(path.sep+'node_modules'))
 returnfalse;
 -constpjson=readPackage(checkPath);
 +constpjson=readPackage(checkPath+path.sep);
 if(pjson)return{
 path: checkPath,
 data: pjson