From 053234f7d69551235f4b6302d3d4438b3ea780d4 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 22 Aug 2023 14:20:37 +0200
Subject: [PATCH] =?UTF-8?q?fix(npm):=20don=E2=80=99t=20massage=20package.j?=
=?UTF-8?q?son=20before=20updating?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/modules/manager/npm/post-update/index.ts | 36 ++------------------
1 file changed, 2 insertions(+), 34 deletions(-)
diff --git a/lib/modules/manager/npm/post-update/index.ts b/lib/modules/manager/npm/post-update/index.ts
index 7e78008887..4fe3074a3c 100644
--- a/lib/modules/manager/npm/post-update/index.ts
+++ b/lib/modules/manager/npm/post-update/index.ts
@@ -1,7 +1,6 @@
// TODO: types (#22198)
import is from '@sindresorhus/is';
import deepmerge from 'deepmerge';
-import detectIndent from 'detect-indent';
import { dump, load } from 'js-yaml';
import upath from 'upath';
import { SYSTEM_INSUFFICIENT_DISK_SPACE } from '../../../../constants/error-messages';
@@ -25,7 +24,7 @@ import { NpmDatasource } from '../../../datasource/npm';
import { scm } from '../../../platform/scm';
import type { PackageFile, PostUpdateConfig, Upgrade } from '../../types';
import { getZeroInstallPaths } from '../extract/yarn';
-import type { NpmDepType, NpmManagerData } from '../types';
+import type { NpmManagerData } from '../types';
import { composeLockFile, parseLockFile } from '../utils';
import * as lerna from './lerna';
import * as npm from './npm';
@@ -290,38 +289,7 @@ export async function writeUpdatedPackageFiles(
continue;
}
logger.debug(`Writing ${packageFile.path}`);
- const detectedIndent =
- // TODO #22198
-
- detectIndent(packageFile.contents!.toString()).indent || ' ';
-
- // TODO #22198
-
- const massagedFile = JSON.parse(packageFile.contents!.toString());
- try {
- const { token } = hostRules.find({
- hostType: 'github',
- url: 'https://api.github.com/',
- });
- for (const upgrade of config.upgrades) {
- // istanbul ignore if: test me
- if (upgrade.gitRef && upgrade.packageFile === packageFile.path) {
- massagedFile[upgrade.depType as NpmDepType][upgrade.depName!] =
- massagedFile[upgrade.depType as NpmDepType][
- upgrade.depName!
- ].replace(
- 'git+https://github.com',
- `git+https://${token}@github.com`
- );
- }
- }
- } catch (err) /* istanbul ignore next */ {
- logger.warn({ err }, 'Error adding token to package files');
- }
- await writeLocalFile(
- packageFile.path,
- JSON.stringify(massagedFile, null, detectedIndent)
- );
+ await writeLocalFile(packageFile.path, packageFile.contents!);
}
}
--
GitLab