mirror of
https://github.com/renovatebot/renovate.git
synced 2025-01-11 14:36:25 +00:00
fix(npm): is.string check for npmrc
This commit is contained in:
parent
95bf948020
commit
47eb1324fb
3 changed files with 4 additions and 3 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
import is from '@sindresorhus/is';
|
||||||
import type { GetReleasesConfig, ReleaseResult } from '../types';
|
import type { GetReleasesConfig, ReleaseResult } from '../types';
|
||||||
import { getDependency } from './get';
|
import { getDependency } from './get';
|
||||||
import { setNpmrc } from './npmrc';
|
import { setNpmrc } from './npmrc';
|
||||||
|
@ -6,7 +7,7 @@ export async function getReleases({
|
||||||
lookupName,
|
lookupName,
|
||||||
npmrc,
|
npmrc,
|
||||||
}: GetReleasesConfig): Promise<ReleaseResult | null> {
|
}: GetReleasesConfig): Promise<ReleaseResult | null> {
|
||||||
if (npmrc) {
|
if (is.string(npmrc)) {
|
||||||
setNpmrc(npmrc);
|
setNpmrc(npmrc);
|
||||||
}
|
}
|
||||||
const res = await getDependency(lookupName);
|
const res = await getDependency(lookupName);
|
||||||
|
|
|
@ -106,7 +106,7 @@ export async function extractPackageFile(
|
||||||
logger.debug('Stripping package-lock setting from npmrc');
|
logger.debug('Stripping package-lock setting from npmrc');
|
||||||
npmrc = npmrc.replace(/(^|\n)package-lock.*?(\n|$)/g, '\n');
|
npmrc = npmrc.replace(/(^|\n)package-lock.*?(\n|$)/g, '\n');
|
||||||
}
|
}
|
||||||
if (npmrc) {
|
if (is.string(npmrc)) {
|
||||||
if (npmrc.includes('=${') && getAdminConfig().trustLevel !== 'high') {
|
if (npmrc.includes('=${') && getAdminConfig().trustLevel !== 'high') {
|
||||||
logger.debug('Discarding .npmrc file with variables');
|
logger.debug('Discarding .npmrc file with variables');
|
||||||
ignoreNpmrcFile = true;
|
ignoreNpmrcFile = true;
|
||||||
|
|
|
@ -138,7 +138,7 @@ export async function writeExistingFiles(
|
||||||
);
|
);
|
||||||
const npmrc: string = packageFile.npmrc || config.npmrc;
|
const npmrc: string = packageFile.npmrc || config.npmrc;
|
||||||
const npmrcFilename = upath.join(basedir, '.npmrc');
|
const npmrcFilename = upath.join(basedir, '.npmrc');
|
||||||
if (npmrc) {
|
if (is.string(npmrc)) {
|
||||||
try {
|
try {
|
||||||
await outputFile(npmrcFilename, `${npmrc}\n`);
|
await outputFile(npmrcFilename, `${npmrc}\n`);
|
||||||
} catch (err) /* istanbul ignore next */ {
|
} catch (err) /* istanbul ignore next */ {
|
||||||
|
|
Loading…
Reference in a new issue