From dad4e124925d348851255b287214ad7e8b83b7b2 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 20 May 2020 09:36:23 +0200
Subject: [PATCH] chore: remove unused yarnIntegrity and mutex
---
lib/manager/common.ts | 1 -
lib/manager/npm/extract/locked-versions.ts | 7 -------
lib/manager/npm/extract/yarn.ts | 8 +-------
lib/workers/branch/lock-files/yarn.spec.ts | 4 +---
4 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/lib/manager/common.ts b/lib/manager/common.ts
index a9acb45d7d..7d50db550f 100644
--- a/lib/manager/common.ts
+++ b/lib/manager/common.ts
@@ -64,7 +64,6 @@ export interface RangeConfig<T = Record<string, any>> extends ManagerData<T> {
}
export interface NpmLockFiles {
- yarnIntegrity?: boolean;
yarnLock?: string;
packageLock?: string;
shrinkwrapJson?: string;
diff --git a/lib/manager/npm/extract/locked-versions.ts b/lib/manager/npm/extract/locked-versions.ts
index f027632abc..35c5d011af 100644
--- a/lib/manager/npm/extract/locked-versions.ts
+++ b/lib/manager/npm/extract/locked-versions.ts
@@ -21,13 +21,6 @@ export async function getLockedVersions(
dep.lockedVersion =
lockFileCache[yarnLock][`${dep.depName}@${dep.currentValue}`];
}
- // istanbul ignore next
- if (lockFileCache[yarnLock]['@renovate_yarn_integrity']) {
- logger.debug(`${yarnLock} uses integrity hashes`);
- packageFile.yarnIntegrity = true;
- } else {
- logger.debug(`${yarnLock} does not use integrity hashes`);
- }
} else if (npmLock) {
logger.debug('Found ' + npmLock + ' for ' + packageFile.packageFile);
if (!lockFileCache[npmLock]) {
diff --git a/lib/manager/npm/extract/yarn.ts b/lib/manager/npm/extract/yarn.ts
index e19a3fab0f..5af375e6c2 100644
--- a/lib/manager/npm/extract/yarn.ts
+++ b/lib/manager/npm/extract/yarn.ts
@@ -3,9 +3,7 @@ import { logger } from '../../../logger';
import { readLocalFile } from '../../../util/fs';
import { LockFileEntry } from './common';
-export type YarnLock = Record<string, string> & {
- '@renovate_yarn_integrity'?: boolean;
-};
+export type YarnLock = Record<string, string>;
export async function getYarnLock(filePath: string): Promise<YarnLock> {
const yarnLockRaw = await readLocalFile(filePath, 'utf8');
@@ -26,10 +24,6 @@ export async function getYarnLock(filePath: string): Promise<YarnLock> {
)) {
logger.trace({ entry, version: val.version });
lockFile[entry] = val.version;
- // istanbul ignore if
- if (val.integrity) {
- lockFile['@renovate_yarn_integrity'] = true;
- }
}
return lockFile;
} catch (err) {
diff --git a/lib/workers/branch/lock-files/yarn.spec.ts b/lib/workers/branch/lock-files/yarn.spec.ts
index 88a91db06d..069cd1097c 100644
--- a/lib/workers/branch/lock-files/yarn.spec.ts
+++ b/lib/workers/branch/lock-files/yarn.spec.ts
@@ -24,7 +24,6 @@ const fixSnapshots = (snapshots: ExecSnapshots): ExecSnapshots =>
describe(getName(__filename), () => {
beforeEach(() => {
- delete process.env.YARN_MUTEX_FILE;
jest.resetAllMocks();
env.getChildProcessEnv.mockReturnValue(envMock.basic);
});
@@ -54,7 +53,6 @@ describe(getName(__filename), () => {
});
fs.readFile = jest.fn(() => 'package-lock-contents') as never;
- process.env.YARN_MUTEX_FILE = '/tmp/yarn.mutext';
const res = await yarnHelper.generateLockFile('some-dir', {}, {}, [
{ depName: 'some-dep', isLockfileUpdate: true },
]);
@@ -72,7 +70,7 @@ describe(getName(__filename), () => {
fs.readFile = jest.fn(() => 'package-lock-contents') as never;
const config = {
- upgrades: [{ yarnIntegrity: true }],
+ upgrades: [{}],
binarySource: BinarySource.Docker,
cacheDir: 'dummy/dir',
};
--
GitLab