fix(manager/npm): Revert "fix(manager/npm): search for npmrc in the root directory" (renovatebot#36049)

rarkins · web-flow · commit 0d7255e699a6 · 2025-05-20T15:50:19.000Z
diff --git a/lib/modules/manager/npm/extract/index.spec.ts b/lib/modules/manager/npm/extract/index.spec.ts
@@ -188,14 +188,6 @@ describe('modules/manager/npm/extract/index', () => {
     });
 
     it('finds and filters .npmrc', async () => {
-      fs.findLocalSiblingOrParent.mockImplementation(
-        (packageFile, configFile): Promise<string | null> => {
-          if (packageFile === 'package.json' && configFile === '.npmrc') {
-            return Promise.resolve('.npmrc');
-          }
-          return Promise.resolve(null);
-        },
-      );
       fs.readLocalFile.mockImplementation((fileName): Promise<any> => {
         if (fileName === '.npmrc') {
           return Promise.resolve('save-exact = true\npackage-lock = false\n');
@@ -210,15 +202,6 @@ describe('modules/manager/npm/extract/index', () => {
       expect(res?.npmrc).toBe('save-exact = true\n');
     });
 
-    it('uses config.npmrc if no .npmrc is returned from search', async () => {
-      const res = await npmExtract.extractPackageFile(
-        input01Content,
-        'package.json',
-        { ...defaultExtractConfig, npmrc: 'config-npmrc' },
-      );
-      expect(res?.npmrc).toBe('config-npmrc');
-    });
-
     it('uses config.npmrc if no .npmrc exists', async () => {
       fs.readLocalFile.mockResolvedValueOnce(null);
       const res = await npmExtract.extractPackageFile(
@@ -230,14 +213,6 @@ describe('modules/manager/npm/extract/index', () => {
     });
 
     it('uses config.npmrc if .npmrc does exist but npmrcMerge=false', async () => {
-      fs.findLocalSiblingOrParent.mockImplementation(
-        (packageFile, configFile): Promise<string | null> => {
-          if (packageFile === 'package.json' && configFile === '.npmrc') {
-            return Promise.resolve('.npmrc');
-          }
-          return Promise.resolve(null);
-        },
-      );
       fs.readLocalFile.mockImplementation((fileName): Promise<any> => {
         if (fileName === '.npmrc') {
           return Promise.resolve('repo-npmrc\n');
@@ -253,14 +228,6 @@ describe('modules/manager/npm/extract/index', () => {
     });
 
     it('merges config.npmrc and repo .npmrc when npmrcMerge=true', async () => {
-      fs.findLocalSiblingOrParent.mockImplementation(
-        (packageFile, configFile): Promise<string | null> => {
-          if (packageFile === 'package.json' && configFile === '.npmrc') {
-            return Promise.resolve('.npmrc');
-          }
-          return Promise.resolve(null);
-        },
-      );
       fs.readLocalFile.mockImplementation((fileName): Promise<any> => {
         if (fileName === '.npmrc') {
           return Promise.resolve('repo-npmrc\n');
@@ -276,14 +243,6 @@ describe('modules/manager/npm/extract/index', () => {
     });
 
     it('finds and filters .npmrc with variables', async () => {
-      fs.findLocalSiblingOrParent.mockImplementation(
-        (packageFile, configFile): Promise<string | null> => {
-          if (packageFile === 'package.json' && configFile === '.npmrc') {
-            return Promise.resolve('.npmrc');
-          }
-          return Promise.resolve(null);
-        },
-      );
       fs.readLocalFile.mockImplementation((fileName): Promise<any> => {
         if (fileName === '.npmrc') {
           return Promise.resolve(
diff --git a/lib/modules/manager/npm/extract/index.ts b/lib/modules/manager/npm/extract/index.ts
@@ -88,42 +88,40 @@ export async function extractPackageFile(
   }
 
   let npmrc: string | undefined;
-  const npmrcFileName = await findLocalSiblingOrParent(packageFile, '.npmrc');
-  if (npmrcFileName) {
-    let repoNpmrc = await readLocalFile(npmrcFileName, 'utf8');
-    if (is.string(repoNpmrc)) {
-      if (is.string(config.npmrc) && !config.npmrcMerge) {
+  const npmrcFileName = getSiblingFileName(packageFile, '.npmrc');
+  let repoNpmrc = await readLocalFile(npmrcFileName, 'utf8');
+  if (is.string(repoNpmrc)) {
+    if (is.string(config.npmrc) && !config.npmrcMerge) {
+      logger.debug(
+        { npmrcFileName },
+        'Repo .npmrc file is ignored due to config.npmrc with config.npmrcMerge=false',
+      );
+      npmrc = config.npmrc;
+    } else {
+      npmrc = config.npmrc ?? '';
+      if (npmrc.length) {
+        if (!npmrc.endsWith('\n')) {
+          npmrc += '\n';
+        }
+      }
+      if (repoNpmrc?.includes('package-lock')) {
+        logger.debug('Stripping package-lock setting from .npmrc');
+        repoNpmrc = repoNpmrc.replace(
+          regEx(/(^|\n)package-lock.*?(\n|$)/g),
+          '\n',
+        );
+      }
+      if (repoNpmrc.includes('=${') && !GlobalConfig.get('exposeAllEnv')) {
         logger.debug(
           { npmrcFileName },
-          'Repo .npmrc file is ignored due to config.npmrc with config.npmrcMerge=false',
+          'Stripping .npmrc file of lines with variables',
         );
-        npmrc = config.npmrc;
-      } else {
-        npmrc = config.npmrc ?? '';
-        if (npmrc.length) {
-          if (!npmrc.endsWith('\n')) {
-            npmrc += '\n';
-          }
-        }
-        if (repoNpmrc?.includes('package-lock')) {
-          logger.debug('Stripping package-lock setting from .npmrc');
-          repoNpmrc = repoNpmrc.replace(
-            regEx(/(^|\n)package-lock.*?(\n|$)/g),
-            '\n',
-          );
-        }
-        if (repoNpmrc.includes('=${') && !GlobalConfig.get('exposeAllEnv')) {
-          logger.debug(
-            { npmrcFileName },
-            'Stripping .npmrc file of lines with variables',
-          );
-          repoNpmrc = repoNpmrc
-            .split(newlineRegex)
-            .filter((line) => !line.includes('=${'))
-            .join('\n');
-        }
-        npmrc += repoNpmrc;
+        repoNpmrc = repoNpmrc
+          .split(newlineRegex)
+          .filter((line) => !line.includes('=${'))
+          .join('\n');
       }
+      npmrc += repoNpmrc;
     }
   } else if (is.string(config.npmrc)) {
     npmrc = config.npmrc;
diff --git a/lib/workers/repository/onboarding/branch/index.spec.ts b/lib/workers/repository/onboarding/branch/index.spec.ts
@@ -91,15 +91,6 @@ describe('workers/repository/onboarding/branch/index', () => {
             '}\n',
         );
         scm.getFileList.mockResolvedValue(['package.json']);
-        fs.findLocalSiblingOrParent.mockImplementation(
-          (packageFile, configFile): Promise<string | null> => {
-            if (packageFile === 'package.json' && configFile === '.npmrc') {
-              return Promise.resolve('.npmrc');
-            }
-            return Promise.resolve(null);
-          },
-        );
-
         fs.readLocalFile.mockResolvedValue('{}');
         await checkOnboardingBranch(config);
         const file = scm.commitAndPush.mock.calls[0][0]
@@ -125,14 +116,6 @@ describe('workers/repository/onboarding/branch/index', () => {
           '}\n',
       );
       scm.getFileList.mockResolvedValue(['package.json']);
-      fs.findLocalSiblingOrParent.mockImplementation(
-        (packageFile, configFile): Promise<string | null> => {
-          if (packageFile === 'package.json' && configFile === '.npmrc') {
-            return Promise.resolve('.npmrc');
-          }
-          return Promise.resolve(null);
-        },
-      );
       fs.readLocalFile.mockResolvedValue('{}');
       await checkOnboardingBranch(config);
       const expectConfig = {
