From da95dd773216a7fe7bf985014f3920893cbdf23d Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Thu, 16 Jul 2020 17:19:04 -0400 Subject: [PATCH] Revert "module: fix check for package.json at volume root" This reverts commit 51af89fe453738262e2c10c831705a385ec78530. This has needed to be backed out of both the 14.5.0 and 14.6.0 releases due to creating regressions across multiple projects including: * coffeescript * JSONStream * gulp * and more We should reopen a PR to figure out how to land this in a way that is non-breaking. Refs: https://github.com/nodejs/node/pull/33476 PR-URL: https://github.com/nodejs/node/pull/34403 Reviewed-By: Richard Lau Reviewed-By: Guy Bedford Reviewed-By: Geoffrey Booth Reviewed-By: Trivikram Kamat --- lib/internal/modules/cjs/loader.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js index c3c0758cf8ab47..eba9a54641b34c 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -49,7 +49,6 @@ const { SafeSet, String, StringPrototypeIndexOf, - StringPrototypeLastIndexOf, StringPrototypeMatch, StringPrototypeSlice, StringPrototypeStartsWith, @@ -310,13 +309,12 @@ function readPackageScope(checkPath) { const rootSeparatorIndex = checkPath.indexOf(path.sep); let separatorIndex; while ( - (separatorIndex = StringPrototypeLastIndexOf(checkPath, path.sep)) >= - rootSeparatorIndex + (separatorIndex = checkPath.lastIndexOf(path.sep)) > rootSeparatorIndex ) { checkPath = checkPath.slice(0, separatorIndex); if (checkPath.endsWith(path.sep + 'node_modules')) return false; - const pjson = readPackage(checkPath + path.sep); + const pjson = readPackage(checkPath); if (pjson) return { path: checkPath, data: pjson