From 1c429f603785b9afee2254decd6a81d8c894a60d Mon Sep 17 00:00:00 2001
From: Gabriel-Ladzaretti
<97394622+Gabriel-Ladzaretti@users.noreply.github.com>
Date: Tue, 9 Aug 2022 19:43:58 +0300
Subject: [PATCH] refactor(repository/merge): extract unnecessarily nested
function from `detectConfigFile` (#17066)
extract unnecessary nested function from `detectConfigFile`
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
---
lib/workers/repository/init/merge.ts | 43 ++++++++++++++--------------
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/lib/workers/repository/init/merge.ts b/lib/workers/repository/init/merge.ts
index f0528cef20..154323bed0 100644
--- a/lib/workers/repository/init/merge.ts
+++ b/lib/workers/repository/init/merge.ts
@@ -23,6 +23,28 @@ import { getFileList } from '../../../util/git';
import * as hostRules from '../../../util/host-rules';
import type { RepoFileConfig } from './types';
+async function detectConfigFile(): Promise<string | null> {
+ const fileList = await getFileList();
+ for (const fileName of configFileNames) {
+ if (fileName === 'package.json') {
+ try {
+ const pJson = JSON.parse(
+ (await readLocalFile('package.json', 'utf8'))!
+ );
+ if (pJson.renovate) {
+ logger.debug('Using package.json for global renovate config');
+ return 'package.json';
+ }
+ } catch (err) {
+ // Do nothing
+ }
+ } else if (fileList.includes(fileName)) {
+ return fileName;
+ }
+ }
+ return null;
+}
+
export async function detectRepoFileConfig(): Promise<RepoFileConfig> {
const cache = getCache();
let { configFileName } = cache;
@@ -36,27 +58,6 @@ export async function detectRepoFileConfig(): Promise<RepoFileConfig> {
}
logger.debug('Existing config file no longer exists');
}
- const fileList = await getFileList();
- async function detectConfigFile(): Promise<string | null> {
- for (const fileName of configFileNames) {
- if (fileName === 'package.json') {
- try {
- const pJson = JSON.parse(
- (await readLocalFile('package.json', 'utf8'))!
- );
- if (pJson.renovate) {
- logger.debug('Using package.json for global renovate config');
- return 'package.json';
- }
- } catch (err) {
- // Do nothing
- }
- } else if (fileList.includes(fileName)) {
- return fileName;
- }
- }
- return null;
- }
configFileName = (await detectConfigFile()) ?? undefined;
if (!configFileName) {
logger.debug('No renovate config file found');
--
GitLab