From d88159f2356b5f63bdb0ed3cb65038ef1aca6bbb Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Sat, 30 May 2020 19:59:31 +0200
Subject: [PATCH] refactor: yarn/pnpm env
---
lib/manager/npm/post-update/pnpm.ts | 4 ++--
lib/manager/npm/post-update/yarn.spec.ts | 2 +-
lib/manager/npm/post-update/yarn.ts | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/manager/npm/post-update/pnpm.ts b/lib/manager/npm/post-update/pnpm.ts
index 09d32ba093..9b1d5383fd 100644
--- a/lib/manager/npm/post-update/pnpm.ts
+++ b/lib/manager/npm/post-update/pnpm.ts
@@ -26,8 +26,8 @@ export async function generateLockFile(
const execOptions: ExecOptions = {
cwd,
extraEnv: {
- NPM_CONFIG_CACHE: process.env.NPM_CONFIG_CACHE,
- npm_config_store: process.env.npm_config_store,
+ NPM_CONFIG_CACHE: env.NPM_CONFIG_CACHE,
+ npm_config_store: env.npm_config_store,
},
docker: {
image: 'renovate/node',
diff --git a/lib/manager/npm/post-update/yarn.spec.ts b/lib/manager/npm/post-update/yarn.spec.ts
index 05bfa1d345..09f50f5eaa 100644
--- a/lib/manager/npm/post-update/yarn.spec.ts
+++ b/lib/manager/npm/post-update/yarn.spec.ts
@@ -98,7 +98,7 @@ describe(getName(__filename), () => {
fs.readFile.mockImplementationOnce(() => {
throw new Error('not-found');
});
- const res = await yarnHelper.generateLockFile('some-dir');
+ const res = await yarnHelper.generateLockFile('some-dir', {});
expect(fs.readFile).toHaveBeenCalledTimes(2);
expect(res.error).toBe(true);
expect(res.lockFile).not.toBeDefined();
diff --git a/lib/manager/npm/post-update/yarn.ts b/lib/manager/npm/post-update/yarn.ts
index 093c6694ef..806747dcd1 100644
--- a/lib/manager/npm/post-update/yarn.ts
+++ b/lib/manager/npm/post-update/yarn.ts
@@ -32,7 +32,7 @@ export async function hasYarnOfflineMirror(cwd: string): Promise<boolean> {
export async function generateLockFile(
cwd: string,
- env?: NodeJS.ProcessEnv,
+ env: NodeJS.ProcessEnv,
config: PostUpdateConfig = {},
upgrades: Upgrade[] = []
): Promise<GenerateLockFileResult> {
@@ -58,8 +58,8 @@ export async function generateLockFile(
const execOptions: ExecOptions = {
cwd,
extraEnv: {
- NPM_CONFIG_CACHE: env?.NPM_CONFIG_CACHE,
- npm_config_store: env?.npm_config_store,
+ NPM_CONFIG_CACHE: env.NPM_CONFIG_CACHE,
+ npm_config_store: env.npm_config_store,
},
docker: {
image: 'renovate/node',
--
GitLab